Configurable clipboard auto-clear timeout

apex/jobscheduler/framework/java/android/app/AlarmManager.java

@@ -26,6 +26,7 @@
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
 import android.annotation.TestApi;
+import android.app.compat.gms.GmsCompat;
 import android.compat.annotation.ChangeId;
 import android.compat.annotation.Disabled;
 import android.compat.annotation.EnabledSince;
@@ -936,6 +937,14 @@ private void setImpl(@AlarmType int type, long triggerAtMillis, long windowMilli
             long intervalMillis, int flags, PendingIntent operation, final OnAlarmListener listener,
             String listenerTag, Executor targetExecutor, WorkSource workSource,
             AlarmClockInfo alarmClock) {
+        if (GmsCompat.isEnabled()) {
+            if (windowMillis == WINDOW_EXACT && !canScheduleExactAlarms()) {
+                windowMillis = WINDOW_HEURISTIC;
+            }
+            // non-null WorkSource requires privileged UPDATE_DEVICE_STATS permission
+            workSource = null;
+        }
+
         if (triggerAtMillis < 0) {
             /* NOTYET
             if (mAlwaysExact) {

apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java

@@ -30,8 +30,11 @@
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
 import android.annotation.UserHandleAware;
+import android.app.compat.gms.GmsCompat;
 import android.content.Context;
 
+import com.android.internal.gmscompat.client.ClientPriorityManager;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -579,6 +582,11 @@ public void removeFromPermanentAllowList(@NonNull String packageName) {
     @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST)
     public void addToTemporaryAllowList(@NonNull String packageName, @ReasonCode int reasonCode,
             @Nullable String reason, long durationMs) {
+        if (GmsCompat.isEnabled()) {
+            ClientPriorityManager.raiseToForeground(packageName, durationMs, reason, reasonCode);
+            return;
+        }
+
         try {
             mService.addPowerSaveTempWhitelistApp(packageName, durationMs, mContext.getUserId(),
                     reasonCode, reason);

apex/jobscheduler/framework/java/com/android/server/DeviceIdleInternal.java

@@ -73,7 +73,7 @@ void addPowerSaveTempWhitelistAppDirect(int uid, long duration,
 
     boolean isAppOnWhitelist(int appid);
 
-    int[] getPowerSaveWhitelistUserAppIds();
+    int[] getPowerSaveWhitelistAppIds();
 
     int[] getPowerSaveTempWhitelistAppIds();
 

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

@@ -2090,14 +2090,14 @@ public boolean isAppOnWhitelist(int appid) {
         }
 
         /**
-         * Returns the array of app ids whitelisted by user. Take care not to
+         * Returns the array of whitelisted app ids. Take care not to
          * modify this, as it is a reference to the original copy. But the reference
          * can change when the list changes, so it needs to be re-acquired when
          * {@link PowerManager#ACTION_POWER_SAVE_WHITELIST_CHANGED} is sent.
          */
         @Override
-        public int[] getPowerSaveWhitelistUserAppIds() {
-            return DeviceIdleController.this.getPowerSaveWhitelistUserAppIds();
+        public int[] getPowerSaveWhitelistAppIds() {
+            return DeviceIdleController.this.getAppIdWhitelistInternal();
         }
 
         @Override

apex/jobscheduler/service/java/com/android/server/job/controllers/DeviceIdleJobsController.java

@@ -89,7 +89,7 @@ public void onReceive(Context context, Intent intent) {
                 case PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED:
                     synchronized (mLock) {
                         mDeviceIdleWhitelistAppIds =
-                                mLocalDeviceIdleController.getPowerSaveWhitelistUserAppIds();
+                                mLocalDeviceIdleController.getPowerSaveWhitelistAppIds();
                         if (DEBUG) {
                             Slog.d(TAG, "Got whitelist "
                                     + Arrays.toString(mDeviceIdleWhitelistAppIds));
@@ -132,7 +132,7 @@ public DeviceIdleJobsController(JobSchedulerService service) {
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
         mLocalDeviceIdleController =
                 LocalServices.getService(DeviceIdleInternal.class);
-        mDeviceIdleWhitelistAppIds = mLocalDeviceIdleController.getPowerSaveWhitelistUserAppIds();
+        mDeviceIdleWhitelistAppIds = mLocalDeviceIdleController.getPowerSaveWhitelistAppIds();
         mPowerSaveTempWhitelistAppIds =
                 mLocalDeviceIdleController.getPowerSaveTempWhitelistAppIds();
         mDeviceIdleUpdateFunctor = new DeviceIdleUpdateFunctor();
@@ -193,7 +193,7 @@ public void setUidActiveLocked(int uid, boolean active) {
     }
 
     /**
-     * Checks if the given job's scheduling app id exists in the device idle user whitelist.
+     * Checks if the given job's scheduling app id exists in the device idle whitelist.
      */
     boolean isWhitelistedLocked(JobStatus job) {
         return Arrays.binarySearch(mDeviceIdleWhitelistAppIds,

cmds/app_process/app_main.cpp

@@ -85,8 +85,10 @@ class AppRuntime : public AndroidRuntime
         AndroidRuntime* ar = AndroidRuntime::getRuntime();
         ar->callMain(mClassName, mClass, mArgs);
 
-        IPCThreadState::self()->stopProcess();
-        hardware::IPCThreadState::self()->stopProcess();
+        if (mClassName != "com.android.internal.os.ExecInit") {
+            IPCThreadState::self()->stopProcess();
+            hardware::IPCThreadState::self()->stopProcess();
+        }
     }
 
     virtual void onZygoteInit()

cmds/hid/jni/com_android_commands_hid_Device.cpp

@@ -354,7 +354,7 @@ static void closeDevice(JNIEnv* /* env */, jclass /* clazz */, jlong ptr) {
     }
 }
 
-static JNINativeMethod sMethods[] = {
+static const JNINativeMethod sMethods[] = {
         {"nativeOpenDevice",
          "(Ljava/lang/String;IIII[B"
          "Lcom/android/commands/hid/Device$DeviceCallback;)J",

cmds/uinput/jni/com_android_commands_uinput_Device.cpp

@@ -301,7 +301,7 @@ static void setAbsInfo(JNIEnv* env, jclass /* clazz */, jint handle, jint axisCo
     ::ioctl(static_cast<int>(handle), UI_ABS_SETUP, &absSetup);
 }
 
-static JNINativeMethod sMethods[] = {
+static const JNINativeMethod sMethods[] = {
         {"nativeOpenUinputDevice",
          "(Ljava/lang/String;IIIII"
          "Lcom/android/commands/uinput/Device$DeviceCallback;)J",

core/api/current.txt

@@ -122,6 +122,7 @@ package android {
     field public static final String NFC = "android.permission.NFC";
     field public static final String NFC_PREFERRED_PAYMENT_INFO = "android.permission.NFC_PREFERRED_PAYMENT_INFO";
     field public static final String NFC_TRANSACTION_EVENT = "android.permission.NFC_TRANSACTION_EVENT";
+    field public static final String OTHER_SENSORS = "android.permission.OTHER_SENSORS";
     field public static final String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";
     field public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
     field @Deprecated public static final String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
@@ -225,7 +226,9 @@ package android {
     field public static final String LOCATION = "android.permission-group.LOCATION";
     field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
     field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
+    field public static final String NETWORK = "android.permission-group.NETWORK";
     field public static final String NOTIFICATIONS = "android.permission-group.NOTIFICATIONS";
+    field public static final String OTHER_SENSORS = "android.permission-group.OTHER_SENSORS";
     field public static final String PHONE = "android.permission-group.PHONE";
     field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL";
     field public static final String READ_MEDIA_VISUAL = "android.permission-group.READ_MEDIA_VISUAL";

core/api/module-lib-current.txt

@@ -68,6 +68,16 @@ package android.app.admin {
 
 }
 
+package android.app.compat.gms {
+
+  public class GmsModuleHooks {
+    method public static void enableBluetoothAdapter();
+    method public static boolean interceptSynchronousResultReceiverException(@NonNull RuntimeException);
+    method public static void makeBluetoothAdapterDiscoverable();
+  }
+
+}
+
 package android.content {
 
   public abstract class ContentProvider implements android.content.ComponentCallbacks2 {
@@ -392,6 +402,11 @@ package android.os {
     field public static final long TRACE_TAG_NETWORK = 2097152L; // 0x200000L
   }
 
+  public final class UserHandle implements android.os.Parcelable {
+    method public static int getUid(int, int);
+    method public static int getUserId(int);
+  }
+
 }
 
 package android.os.storage {

core/api/system-current.txt

@@ -951,6 +951,24 @@ package android.app {
     method public boolean isStatusBarExpansionDisabled();
   }
 
+  public final class StorageScope {
+    ctor public StorageScope(@NonNull String, int);
+    method @NonNull public static android.content.Intent createConfigActivityIntent(@NonNull String);
+    method @NonNull public static android.app.StorageScope[] deserializeArray(@NonNull android.content.pm.GosPackageState);
+    method public boolean isDirectory();
+    method public boolean isFile();
+    method public boolean isWritable();
+    method public static int maxArrayLength();
+    method @Nullable public static byte[] serializeArray(@NonNull android.app.StorageScope[]);
+    field public static final String EXTERNAL_STORAGE_PROVIDER_METHOD_CONVERT_DOC_ID_TO_PATH = "StorageScopes_convertDocIdToPath";
+    field public static final int FLAG_ALLOW_WRITES = 1; // 0x1
+    field public static final int FLAG_IS_DIR = 2; // 0x2
+    field public static final String MEDIA_PROVIDER_METHOD_INVALIDATE_MEDIA_PROVIDER_CACHE = "StorageScopes_invalidateCache";
+    field public static final String MEDIA_PROVIDER_METHOD_MEDIA_ID_TO_FILE_PATH = "StorageScopes_mediaIdToFilePath";
+    field public final int flags;
+    field @NonNull public final String path;
+  }
+
   public final class SystemServiceRegistry {
     method public static <TServiceClass> void registerContextAwareService(@NonNull String, @NonNull Class<TServiceClass>, @NonNull android.app.SystemServiceRegistry.ContextAwareServiceProducerWithBinder<TServiceClass>);
     method public static <TServiceClass> void registerContextAwareService(@NonNull String, @NonNull Class<TServiceClass>, @NonNull android.app.SystemServiceRegistry.ContextAwareServiceProducerWithoutBinder<TServiceClass>);
@@ -1739,6 +1757,16 @@ package android.app.compat {
 
 }
 
+package android.app.compat.gms {
+
+  public final class GmsCompat {
+    method public static boolean hasPermission(@NonNull String);
+    method public static boolean isEnabled();
+    method public static boolean isGmsApp(@NonNull String, int);
+  }
+
+}
+
 package android.app.contentsuggestions {
 
   public final class ClassificationsRequest implements android.os.Parcelable {
@@ -3168,6 +3196,11 @@ package android.content.om {
 
 package android.content.pm {
 
+  public class AppPermissionUtils {
+    method public static boolean shouldSkipPermissionRequestDialog(@NonNull android.content.pm.GosPackageState, @NonNull String);
+    method public static boolean shouldSpoofPermissionRequestResult(@NonNull android.content.pm.GosPackageState, @NonNull String);
+  }
+
   public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
     method public boolean isEncryptionAware();
     method public boolean isInstantApp();
@@ -3191,6 +3224,53 @@ package android.content.pm {
     method @NonNull public final int getType();
   }
 
+  public final class GosPackageState implements android.os.Parcelable {
+    method public static boolean attachableToPackage(@NonNull String);
+    method public int describeContents();
+    method @NonNull public android.content.pm.GosPackageState.Editor edit();
+    method @NonNull public static android.content.pm.GosPackageState.Editor edit(@NonNull String);
+    method @NonNull public static android.content.pm.GosPackageState.Editor edit(@NonNull String, int);
+    method @Nullable public static android.content.pm.GosPackageState get(@NonNull String);
+    method @Nullable public static android.content.pm.GosPackageState get(@NonNull String, int);
+    method @Nullable public static android.content.pm.GosPackageState getForSelf();
+    method @NonNull public String getPackageName();
+    method public int getUserId();
+    method public boolean hasDerivedFlag(int);
+    method public boolean hasDerivedFlags(int);
+    method public boolean hasFlag(int);
+    method public final boolean hasFlags(int);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.GosPackageState> CREATOR;
+    field public static final int DFLAGS_SET = 1; // 0x1
+    field public static final int DFLAG_EXPECTS_ACCESS_TO_MEDIA_FILES_ONLY = 4; // 0x4
+    field public static final int DFLAG_EXPECTS_ALL_FILES_ACCESS = 2; // 0x2
+    field public static final int DFLAG_EXPECTS_LEGACY_EXTERNAL_STORAGE = 4096; // 0x1000
+    field public static final int DFLAG_EXPECTS_STORAGE_WRITE_ACCESS = 8; // 0x8
+    field public static final int DFLAG_HAS_ACCESS_MEDIA_LOCATION_DECLARATION = 256; // 0x100
+    field public static final int DFLAG_HAS_MANAGE_EXTERNAL_STORAGE_DECLARATION = 64; // 0x40
+    field public static final int DFLAG_HAS_MANAGE_MEDIA_DECLARATION = 128; // 0x80
+    field public static final int DFLAG_HAS_READ_EXTERNAL_STORAGE_DECLARATION = 16; // 0x10
+    field public static final int DFLAG_HAS_READ_MEDIA_AUDIO_DECLARATION = 512; // 0x200
+    field public static final int DFLAG_HAS_READ_MEDIA_IMAGES_DECLARATION = 1024; // 0x400
+    field public static final int DFLAG_HAS_READ_MEDIA_VIDEO_DECLARATION = 2048; // 0x800
+    field public static final int DFLAG_HAS_WRITE_EXTERNAL_STORAGE_DECLARATION = 32; // 0x20
+    field public static final int FLAG_ALLOW_ACCESS_TO_OBB_DIRECTORY = 2; // 0x2
+    field public static final int FLAG_DISABLE_HARDENED_MALLOC = 4; // 0x4
+    field public static final int FLAG_ENABLE_COMPAT_VA_39_BIT = 8; // 0x8
+    field public static final int FLAG_STORAGE_SCOPES_ENABLED = 1; // 0x1
+    field public final int derivedFlags;
+  }
+
+  public static class GosPackageState.Editor {
+    method @NonNull public android.content.pm.GosPackageState.Editor addFlags(int);
+    method @Nullable public android.content.pm.GosPackageState apply();
+    method @NonNull public android.content.pm.GosPackageState.Editor clearFlags(int);
+    method @NonNull public android.content.pm.GosPackageState.Editor killUidAfterApply();
+    method @NonNull public android.content.pm.GosPackageState.Editor setFlagsState(int, boolean);
+    method @NonNull public android.content.pm.GosPackageState.Editor setKillUidAfterApply(boolean);
+    method @NonNull public android.content.pm.GosPackageState.Editor setStorageScopes(@Nullable byte[]);
+  }
+
   public final class InstallationFile {
     method public long getLengthBytes();
     method public int getLocation();
@@ -3546,6 +3626,14 @@ package android.content.pm {
     field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.ShortcutManager.ShareShortcutInfo> CREATOR;
   }
 
+  public class SpecialRuntimePermAppUtils {
+    method public static boolean awareOfRuntimeInternetPermission();
+    method public static boolean isInternetCompatEnabled();
+    method public static boolean requestsInternetPermission();
+    field public static final int FLAG_AWARE_OF_RUNTIME_INTERNET_PERMISSION = 4; // 0x4
+    field public static final int FLAG_REQUESTS_INTERNET_PERMISSION = 2; // 0x2
+  }
+
   public final class SuspendDialogInfo implements android.os.Parcelable {
     method public int describeContents();
     method public void writeToParcel(android.os.Parcel, int);

core/java/android/app/Activity.java

@@ -43,6 +43,7 @@
 import android.app.admin.DevicePolicyManager;
 import android.app.assist.AssistContent;
 import android.app.compat.CompatChanges;
+import android.app.compat.gms.GmsCompat;
 import android.compat.annotation.ChangeId;
 import android.compat.annotation.EnabledSince;
 import android.compat.annotation.UnsupportedAppUsage;
@@ -160,6 +161,9 @@
 import com.android.internal.app.IVoiceInteractor;
 import com.android.internal.app.ToolbarActionBar;
 import com.android.internal.app.WindowDecorActionBar;
+import com.android.internal.gmscompat.GmsCompatApp;
+import com.android.internal.gmscompat.GmsHooks;
+import com.android.internal.gmscompat.PlayStoreHooks;
 import com.android.internal.policy.PhoneWindow;
 import com.android.internal.util.dump.DumpableContainerImpl;
 
@@ -1652,6 +1656,10 @@ private void notifyVoiceInteractionManagerServiceActivityEvent(
     @MainThread
     @CallSuper
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        if (GmsCompat.isEnabled()) {
+            GmsHooks.activityOnCreate(this);
+        }
+
         if (DEBUG_LIFECYCLE) Slog.v(TAG, "onCreate " + this + ": " + savedInstanceState);
 
         if (mLastNonConfigurationInstances != null) {
@@ -5500,6 +5508,45 @@ public void startActivityForResult(@RequiresPermission Intent intent, int reques
      */
     public void startActivityForResult(@RequiresPermission Intent intent, int requestCode,
             @Nullable Bundle options) {
+        if (GmsCompat.isEnabled()) {
+            ComponentName cn = intent.getComponent();
+            if (cn != null && "com.google.android.permissioncontroller".equals(cn.getPackageName())) {
+                // PermissionController activities can't be opened by unprivileged apps.
+                // (Replacing absent com.google.android.permissioncontroller package with
+                // com.android.permissioncontroller would not help)
+                return;
+            }
+        }
+
+        if (android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS.equals(intent.getAction())) {
+            Uri data = intent.getData();
+            if (data != null && "package".equals(data.getScheme())) {
+                String pkg = data.getSchemeSpecificPart();
+
+                if (pkg != null) {
+                    switch (pkg) {
+                        case "com.google.android.tts":
+                        if (GmsCompat.isClientOfGmsCore()) {
+                            boolean installed;
+                            try {
+                                installed = ActivityThread.getPackageManager().getApplicationInfo(pkg, 0, getUserId()) != null;
+                            } catch (RemoteException e) {
+                                throw e.rethrowFromSystemServer();
+                            }
+
+                            if (!installed) {
+                                try {
+                                    GmsCompatApp.iClientOfGmsCore2Gca().showMissingAppNotification(pkg);
+                                } catch (RemoteException e) {
+                                    GmsCompatApp.callFailed(e);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         if (mParent == null) {
             options = transferSpringboardActivityOptions(options);
             Instrumentation.ActivityResult ar =