Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master (8c993595) · Commits · e / os / android_frameworks_base

core/java/android/accounts/ChooseAccountActivity.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		package android.accounts;

		import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.ActivityTaskManager;
		import android.content.Context;
		import android.content.pm.PackageManager;
		@@ -25,8 +24,8 @@ import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.util.Log;
		import android.view.LayoutInflater;
		@@ -37,6 +36,7 @@ import android.widget.ArrayAdapter;
		import android.widget.ImageView;
		import android.widget.ListView;
		import android.widget.TextView;

		import com.android.internal.R;

		import java.util.HashMap;
		@@ -60,6 +60,9 @@ public class ChooseAccountActivity extends Activity {
		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		getWindow().addSystemFlags(
		android.view.WindowManager.LayoutParams
		.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		mAccounts = getIntent().getParcelableArrayExtra(AccountManager.KEY_ACCOUNTS);
		mAccountManagerResponse =
		getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE);

core/java/android/accounts/ChooseAccountTypeActivity.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.widget.ArrayAdapter;
		import android.widget.ImageView;
		import android.widget.ListView;
		import android.widget.TextView;

		import com.android.internal.R;

		import java.util.ArrayList;
		@@ -51,7 +52,9 @@ public class ChooseAccountTypeActivity extends Activity {
		@Override
		public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		getWindow().addSystemFlags(
		android.view.WindowManager.LayoutParams
		.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.v(TAG, "ChooseAccountTypeActivity.onCreate(savedInstanceState="
		+ savedInstanceState + ")");

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -15,11 +15,8 @@
		*/
		package android.accounts;

		import android.app.ActivityTaskManager;
		import com.google.android.collect.Sets;

		import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.ActivityTaskManager;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.IBinder;
		@@ -39,6 +36,8 @@ import android.widget.TextView;

		import com.android.internal.R;

		import com.google.android.collect.Sets;

		import java.io.IOException;
		import java.util.ArrayList;
		import java.util.HashSet;
		@@ -143,7 +142,9 @@ public class ChooseTypeAndAccountActivity extends Activity
		Log.v(TAG, "ChooseTypeAndAccountActivity.onCreate(savedInstanceState="
		+ savedInstanceState + ")");
		}

		getWindow().addSystemFlags(
		android.view.WindowManager.LayoutParams
		.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		String message = null;

		try {

core/java/android/hardware/display/DisplayManager.java

+8 −47

Original line number	Diff line number	Diff line
		@@ -870,76 +870,37 @@ public final class DisplayManager {
		public interface DeviceConfig {

		/**
		* Key for refresh rate in the low zone defined by thresholds.
		* Key for refresh rate in the zone defined by thresholds.
		*
		* Note that the name and value don't match because they were added before we had a high
		* zone to consider.
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.integer#config_defaultZoneBehavior
		*/
		String KEY_REFRESH_RATE_IN_LOW_ZONE = "refresh_rate_in_zone";
		String KEY_REFRESH_RATE_IN_ZONE = "refresh_rate_in_zone";

		/**
		* Key for accessing the low display brightness thresholds for the configured refresh
		* rate zone.
		* Key for accessing the display brightness thresholds for the configured refresh rate zone.
		* The value will be a pair of comma separated integers representing the minimum and maximum
		* thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).
		*
		* Note that the name and value don't match because they were added before we had a high
		* zone to consider.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.array#config_brightnessThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS =
		String KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_brightness_thresholds";

		/**
		* Key for accessing the low ambient brightness thresholds for the configured refresh
		* rate zone. The value will be a pair of comma separated integers representing the minimum
		* and maximum thresholds of the zone, respectively, in lux.
		*
		* Note that the name and value don't match because they were added before we had a high
		* zone to consider.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.array#config_ambientThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_ambient_thresholds";
		/**
		* Key for refresh rate in the high zone defined by thresholds.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.integer#config_fixedRefreshRateInHighZone
		*/
		String KEY_REFRESH_RATE_IN_HIGH_ZONE = "refresh_rate_in_high_zone";

		/**
		* Key for accessing the display brightness thresholds for the configured refresh rate zone.
		* The value will be a pair of comma separated integers representing the minimum and maximum
		* thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.array#config_brightnessHighThresholdsOfFixedRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS =
		"fixed_refresh_rate_high_display_brightness_thresholds";

		/**
		* Key for accessing the ambient brightness thresholds for the configured refresh rate zone.
		* The value will be a pair of comma separated integers representing the minimum and maximum
		* thresholds of the zone, respectively, in lux.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.array#config_ambientHighThresholdsOfFixedRefreshRate
		* @see android.R.array#config_ambientThresholdsOfPeakRefreshRate
		* @hide
		*/
		String KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"fixed_refresh_rate_high_ambient_brightness_thresholds";
		String KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"peak_refresh_rate_ambient_thresholds";

		/**
		* Key for default peak refresh rate
		*

core/java/android/provider/CalendarContract.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import android.database.DatabaseUtils;
		import android.net.Uri;
		import android.os.Build;
		import android.os.RemoteException;
		import android.os.StrictMode;
		import android.text.format.DateUtils;
		import android.text.format.TimeMigrationUtils;
		import android.util.Log;
		@@ -2619,7 +2620,13 @@ public final class CalendarContract {
		intent.setData(ContentUris.withAppendedId(CalendarContract.CONTENT_URI, alarmTime));
		intent.putExtra(ALARM_TIME, alarmTime);
		intent.setFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

		// Disable strict mode VM policy violations temporarily for intents that contain a
		// content URI but don't have FLAG_GRANT_READ_URI_PERMISSION.
		StrictMode.VmPolicy oldVmPolicy = StrictMode.allowVmViolations();
		PendingIntent pi = PendingIntent.getBroadcast(context, 0, intent, 0);
		StrictMode.setVmPolicy(oldVmPolicy);

		manager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, alarmTime, pi);
		}