diff options
26 files changed, 72 insertions, 138 deletions
diff --git a/Android.bp b/Android.bp index 5bd332947057..2ab31f4530e9 100644 --- a/Android.bp +++ b/Android.bp @@ -97,7 +97,7 @@ filegroup { ":platform-compat-native-aidl", // AIDL sources from external directories - ":android.hardware.security.keymint-V1-java-source", + ":android.hardware.security.keymint-V2-java-source", ":android.hardware.security.secureclock-V1-java-source", ":android.security.apc-java-source", ":android.security.authorization-java-source", diff --git a/apex/media/Android.bp b/apex/media/Android.bp index 1a710a98b0a9..96e88dd236db 100644 --- a/apex/media/Android.bp +++ b/apex/media/Android.bp @@ -18,11 +18,7 @@ package { "//frameworks/av/apex/testing", ], // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } sdk { diff --git a/apex/media/aidl/Android.bp b/apex/media/aidl/Android.bp index 545a0cd884dc..4ba0d9b03b28 100644 --- a/apex/media/aidl/Android.bp +++ b/apex/media/aidl/Android.bp @@ -16,11 +16,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } filegroup { diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp index 6195f257ecd9..a5e6df1ffb8f 100644 --- a/apex/media/framework/Android.bp +++ b/apex/media/framework/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } java_library { @@ -65,6 +61,7 @@ java_library { "//frameworks/av/apex:__subpackages__", "//frameworks/base/apex/media/service", "//frameworks/base/api", // For framework-all + "//packages/modules/Media/apex/service", ], } diff --git a/apex/media/service/Android.bp b/apex/media/service/Android.bp index 271fc5312f8f..19117357982a 100644 --- a/apex/media/service/Android.bp +++ b/apex/media/service/Android.bp @@ -13,11 +13,7 @@ // limitations under the License. package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } filegroup { diff --git a/core/java/android/app/assist/OWNERS b/core/java/android/app/assist/OWNERS index 46b5ea03c545..e857c72bb28e 100644 --- a/core/java/android/app/assist/OWNERS +++ b/core/java/android/app/assist/OWNERS @@ -1,7 +1,5 @@ +augale@google.com joannechung@google.com -adamhe@google.com -tymtsai@google.com +markpun@google.com lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +tymtsai@google.com diff --git a/core/java/android/app/contentsuggestions/OWNERS b/core/java/android/app/contentsuggestions/OWNERS index 482abb2d94e9..cf54c2a6fcbc 100644 --- a/core/java/android/app/contentsuggestions/OWNERS +++ b/core/java/android/app/contentsuggestions/OWNERS @@ -1,9 +1,7 @@ # Bug component: 643919 +augale@google.com joannechung@google.com -adamhe@google.com -tymtsai@google.com +markpun@google.com lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +tymtsai@google.com diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 30850e3ba06c..001be57fe50d 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3434,7 +3434,7 @@ public abstract class Context { public abstract boolean stopServiceAsUser(Intent service, UserHandle user); /** - * Connect to an application service, creating it if needed. This defines + * Connects to an application service, creating it if needed. This defines * a dependency between your application and the service. The given * <var>conn</var> will receive the service object when it is created and be * told if it dies and restarts. The service will be considered required @@ -3449,11 +3449,8 @@ public abstract class Context { * will be invoked instead of * {@link ServiceConnection#onServiceConnected(ComponentName, IBinder) onServiceConnected()}. * - * <p>This method will throw {@link SecurityException} if the calling app does not - * have permission to bind to the given service. - * - * <p class="note">Note: this method <em>cannot be called from a - * {@link BroadcastReceiver} component</em>. A pattern you can use to + * <p class="note"><b>Note:</b> This method <em>cannot</em> be called from a + * {@link BroadcastReceiver} component. A pattern you can use to * communicate from a BroadcastReceiver to a Service is to call * {@link #startService} with the arguments containing the command to be * sent, with the service calling its @@ -3468,34 +3465,34 @@ public abstract class Context { * specify an explicit component name. * @param conn Receives information as the service is started and stopped. * This must be a valid ServiceConnection object; it must not be null. - * @param flags Operation options for the binding. May be 0, - * {@link #BIND_AUTO_CREATE}, {@link #BIND_DEBUG_UNBIND}, - * {@link #BIND_NOT_FOREGROUND}, {@link #BIND_ABOVE_CLIENT}, - * {@link #BIND_ALLOW_OOM_MANAGEMENT}, {@link #BIND_WAIVE_PRIORITY}. - * {@link #BIND_IMPORTANT}, {@link #BIND_ADJUST_WITH_ACTIVITY}, - * {@link #BIND_NOT_PERCEPTIBLE}, or {@link #BIND_INCLUDE_CAPABILITIES}. - * @return {@code true} if the system is in the process of bringing up a + * @param flags Operation options for the binding. Can be: + * <ul> + * <li>0 + * <li>{@link #BIND_AUTO_CREATE} + * <li>{@link #BIND_DEBUG_UNBIND} + * <li>{@link #BIND_NOT_FOREGROUND} + * <li>{@link #BIND_ABOVE_CLIENT} + * <li>{@link #BIND_ALLOW_OOM_MANAGEMENT} + * <li>{@link #BIND_WAIVE_PRIORITY} + * <li>{@link #BIND_IMPORTANT} + * <li>{@link #BIND_ADJUST_WITH_ACTIVITY} + * <li>{@link #BIND_NOT_PERCEPTIBLE} + * <li>{@link #BIND_INCLUDE_CAPABILITIES} + * </ul> + * + * @return {@code true} if the system is in the process of bringing up a * service that your client has permission to bind to; {@code false} * if the system couldn't find the service or if your client doesn't - * have permission to bind to it. If this value is {@code true}, you - * should later call {@link #unbindService} to release the - * connection. + * have permission to bind to it. You should call {@link #unbindService} + * to release the connection even if this method returned {@code false}. * - * @throws SecurityException If the caller does not have permission to access the service - * or the service can not be found. + * @throws SecurityException If the caller does not have permission to + * access the service or the service cannot be found. Call + * {@link #unbindService} to release the connection when this exception + * is thrown. * * @see #unbindService * @see #startService - * @see #BIND_AUTO_CREATE - * @see #BIND_DEBUG_UNBIND - * @see #BIND_NOT_FOREGROUND - * @see #BIND_ABOVE_CLIENT - * @see #BIND_ALLOW_OOM_MANAGEMENT - * @see #BIND_WAIVE_PRIORITY - * @see #BIND_IMPORTANT - * @see #BIND_ADJUST_WITH_ACTIVITY - * @see #BIND_NOT_PERCEPTIBLE - * @see #BIND_INCLUDE_CAPABILITIES */ public abstract boolean bindService(@RequiresPermission Intent service, @NonNull ServiceConnection conn, @BindServiceFlags int flags); diff --git a/core/java/android/content/ServiceConnection.java b/core/java/android/content/ServiceConnection.java index 21398f6e6473..660a7f0acbba 100644 --- a/core/java/android/content/ServiceConnection.java +++ b/core/java/android/content/ServiceConnection.java @@ -63,8 +63,12 @@ public interface ServiceConnection { * happen, for example, if the application hosting the service it is bound to * has been updated. * - * @param name The concrete component name of the service whose - * connection is dead. + * <p class="note"><b>Note:</b> The app that requested the binding must call + * {@link Context#unbindService(ServiceConnection)} to release the tracking + * resources associated with this ServiceConnection even if this callback was + * invoked following {@link Context#bindService Context.bindService() bindService()}. + * + * @param name The concrete component name of the service whose connection is dead. */ default void onBindingDied(ComponentName name) { } @@ -72,10 +76,10 @@ public interface ServiceConnection { /** * Called when the service being bound has returned {@code null} from its * {@link android.app.Service#onBind(Intent) onBind()} method. This indicates - * that the attempting service binding represented by this ServiceConnection + * that the attempted service binding represented by this ServiceConnection * will never become usable. * - * <p class="note">The app which requested the binding must still call + * <p class="note"><b>Note:</b> The app that requested the binding must still call * {@link Context#unbindService(ServiceConnection)} to release the tracking * resources associated with this ServiceConnection even if this callback was * invoked following {@link Context#bindService Context.bindService() bindService()}. diff --git a/core/java/android/service/autofill/OWNERS b/core/java/android/service/autofill/OWNERS index a08863276da7..9a30e826a24f 100644 --- a/core/java/android/service/autofill/OWNERS +++ b/core/java/android/service/autofill/OWNERS @@ -1,9 +1,3 @@ # Bug component: 351486 -joannechung@google.com -adamhe@google.com -tymtsai@google.com -lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +include /core/java/android/view/autofill/OWNERS diff --git a/core/java/android/service/contentcapture/OWNERS b/core/java/android/service/contentcapture/OWNERS index 6337327cec25..24561c59bba6 100644 --- a/core/java/android/service/contentcapture/OWNERS +++ b/core/java/android/service/contentcapture/OWNERS @@ -1,9 +1,3 @@ # Bug component: 544200 -joannechung@google.com -adamhe@google.com -tymtsai@google.com -lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +include /core/java/android/view/contentcapture/OWNERS diff --git a/core/java/android/service/contentsuggestions/OWNERS b/core/java/android/service/contentsuggestions/OWNERS index 46b5ea03c545..72fe0b1c6392 100644 --- a/core/java/android/service/contentsuggestions/OWNERS +++ b/core/java/android/service/contentsuggestions/OWNERS @@ -1,7 +1,2 @@ -joannechung@google.com -adamhe@google.com -tymtsai@google.com -lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com + +include /core/java/android/app/contentsuggestions/OWNERS diff --git a/core/java/android/service/textclassifier/OWNERS b/core/java/android/service/textclassifier/OWNERS index a535f5258732..c85c69ef14df 100644 --- a/core/java/android/service/textclassifier/OWNERS +++ b/core/java/android/service/textclassifier/OWNERS @@ -1,9 +1,3 @@ # Bug component: 709498 -joannechung@google.com -adamhe@google.com -tymtsai@google.com -lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +include /core/java/android/view/textclassifier/OWNERS diff --git a/core/java/android/service/translation/OWNERS b/core/java/android/service/translation/OWNERS index a1e663aa8ff7..440f9a840057 100644 --- a/core/java/android/service/translation/OWNERS +++ b/core/java/android/service/translation/OWNERS @@ -1,8 +1,3 @@ # Bug component: 994311 -adamhe@google.com -augale@google.com -joannechung@google.com -lpeter@google.com -svetoslavganov@google.com -tymtsai@google.com +include /core/java/android/view/translation/OWNERS diff --git a/core/java/android/service/voice/OWNERS b/core/java/android/service/voice/OWNERS index 46b5ea03c545..59a0c2e36612 100644 --- a/core/java/android/service/voice/OWNERS +++ b/core/java/android/service/voice/OWNERS @@ -1,7 +1,3 @@ -joannechung@google.com -adamhe@google.com -tymtsai@google.com -lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +# Bug component: 533220 + +include /core/java/android/app/assist/OWNERS diff --git a/core/java/android/view/autofill/OWNERS b/core/java/android/view/autofill/OWNERS index a08863276da7..108c42cdde2a 100644 --- a/core/java/android/view/autofill/OWNERS +++ b/core/java/android/view/autofill/OWNERS @@ -1,9 +1,7 @@ # Bug component: 351486 +augale@google.com joannechung@google.com -adamhe@google.com -tymtsai@google.com +markpun@google.com lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +tymtsai@google.com diff --git a/core/java/android/view/contentcapture/OWNERS b/core/java/android/view/contentcapture/OWNERS index 6337327cec25..1a5cb1e4ca4a 100644 --- a/core/java/android/view/contentcapture/OWNERS +++ b/core/java/android/view/contentcapture/OWNERS @@ -1,9 +1,7 @@ # Bug component: 544200 +augale@google.com joannechung@google.com -adamhe@google.com -tymtsai@google.com +markpun@google.com lpeter@google.com -augale@google.com -svetoslavganov@android.com -svetoslavganov@google.com +tymtsai@google.com diff --git a/core/java/android/view/inputmethod/OWNERS b/core/java/android/view/inputmethod/OWNERS index d7db7c741364..9fa7e8f11364 100644 --- a/core/java/android/view/inputmethod/OWNERS +++ b/core/java/android/view/inputmethod/OWNERS @@ -3,4 +3,4 @@ set noparent include /services/core/java/com/android/server/inputmethod/OWNERS -per-file *InlineSuggestion* = file:/core/java/android/service/autofill/OWNERS +per-file *InlineSuggestion* = file:/core/java/android/view/autofill/OWNERS diff --git a/core/java/android/view/textclassifier/OWNERS b/core/java/android/view/textclassifier/OWNERS index 4bcdeea472e3..a205be2f39d0 100644 --- a/core/java/android/view/textclassifier/OWNERS +++ b/core/java/android/view/textclassifier/OWNERS @@ -2,8 +2,6 @@ mns@google.com toki@google.com -svetoslavganov@android.com -svetoslavganov@google.com augale@google.com joannechung@google.com tonymak@google.com diff --git a/core/java/android/view/textclassifier/logging/OWNERS b/core/java/android/view/textclassifier/logging/OWNERS deleted file mode 100644 index ac80d9f4cdd0..000000000000 --- a/core/java/android/view/textclassifier/logging/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -# Bug component: 709498 - -mns@google.com -toki@google.com -svetoslavganov@android.com -svetoslavganov@google.com -augale@google.com -joannechung@google.com diff --git a/core/java/android/view/translation/OWNERS b/core/java/android/view/translation/OWNERS index a1e663aa8ff7..b772ad3f7cab 100644 --- a/core/java/android/view/translation/OWNERS +++ b/core/java/android/view/translation/OWNERS @@ -1,8 +1,7 @@ # Bug component: 994311 -adamhe@google.com augale@google.com joannechung@google.com +markpun@google.com lpeter@google.com -svetoslavganov@google.com tymtsai@google.com diff --git a/core/java/android/widget/inline/OWNERS b/core/java/android/widget/inline/OWNERS new file mode 100644 index 000000000000..9a30e826a24f --- /dev/null +++ b/core/java/android/widget/inline/OWNERS @@ -0,0 +1,3 @@ +# Bug component: 351486 + +include /core/java/android/view/autofill/OWNERS diff --git a/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java b/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java index 1a955c4c57d7..72243f9e87d9 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java +++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java @@ -146,7 +146,7 @@ public class EthernetManager { * @param iface the name of the interface. * @param state the current state of the interface, or {@link #STATE_ABSENT} if the * interface was removed. - * @param role whether the interface is in the client mode or server mode. + * @param role whether the interface is in client mode or server mode. * @param configuration the current IP configuration of the interface. * @hide */ diff --git a/services/autofill/OWNERS b/services/autofill/OWNERS index c52751d79227..edfb2112198a 100644 --- a/services/autofill/OWNERS +++ b/services/autofill/OWNERS @@ -1 +1 @@ -include /core/java/android/service/autofill/OWNERS +include /core/java/android/view/autofill/OWNERS diff --git a/services/translation/OWNERS b/services/translation/OWNERS index a1e663aa8ff7..440f9a840057 100644 --- a/services/translation/OWNERS +++ b/services/translation/OWNERS @@ -1,8 +1,3 @@ # Bug component: 994311 -adamhe@google.com -augale@google.com -joannechung@google.com -lpeter@google.com -svetoslavganov@google.com -tymtsai@google.com +include /core/java/android/view/translation/OWNERS diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 8cb0909def5d..21f789f4e735 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -492,6 +492,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser // current USB state private boolean mHostConnected; + private boolean mUsbAccessoryConnected; private boolean mSourcePower; private boolean mSinkPower; private boolean mConfigured; @@ -961,10 +962,10 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser break; case MSG_UPDATE_HOST_STATE: Iterator devices = (Iterator) msg.obj; - boolean connected = (msg.arg1 == 1); + mUsbAccessoryConnected = (msg.arg1 == 1); if (DEBUG) { - Slog.i(TAG, "HOST_STATE connected:" + connected); + Slog.i(TAG, "HOST_STATE connected:" + mUsbAccessoryConnected); } mHideUsbNotification = false; @@ -1218,7 +1219,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser } else if (mSourcePower) { titleRes = com.android.internal.R.string.usb_supplying_notification_title; id = SystemMessage.NOTE_USB_SUPPLYING; - } else if (mHostConnected && mSinkPower && mUsbCharging) { + } else if (mHostConnected && mSinkPower && (mUsbCharging || mUsbAccessoryConnected)) { titleRes = com.android.internal.R.string.usb_charging_notification_title; id = SystemMessage.NOTE_USB_CHARGING; } |