DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master (3f0bfe46) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountManager.java

+0 −29

Original line number	Diff line number	Diff line
		@@ -1942,35 +1942,6 @@ public class AccountManager {
		}.start();
		}

		/**
		* @hide
		* Removes the shared account.
		* @param account the account to remove
		* @param user the user to remove the account from
		* @return
		*/
		public boolean removeSharedAccount(final Account account, UserHandle user) {
		try {
		boolean val = mService.removeSharedAccountAsUser(account, user.getIdentifier());
		return val;
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* @hide
		* @param user
		* @return
		*/
		public Account[] getSharedAccounts(UserHandle user) {
		try {
		return mService.getSharedAccountsAsUser(user.getIdentifier());
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		}

		/**
		* Confirms that the user knows the password for an account to make extra
		* sure they are the owner of the account. The user-entered password can

+0 −3

Original line number	Diff line number	Diff line
		@@ -80,14 +80,11 @@ interface IAccountManager {
		String authTokenType);

		/* Shared accounts */
		Account[] getSharedAccountsAsUser(int userId);
		boolean removeSharedAccountAsUser(in Account account, int userId);
		void addSharedAccountsFromParentUser(int parentUserId, int userId, String opPackageName);

		/* Account renaming. */
		void renameAccount(in IAccountManagerResponse response, in Account accountToRename, String newName);
		String getPreviousName(in Account account);
		boolean renameSharedAccountAsUser(in Account accountToRename, String newName, int userId);

		/* Add account in two steps. */
		void startAddAccountSession(in IAccountManagerResponse response, String accountType,

+3 −0

Original line number	Diff line number	Diff line
		@@ -344,4 +344,7 @@ public abstract class ActivityManagerInternal {
		* Unregisters the specified {@code processObserver}.
		*/
		public abstract void unregisterProcessObserver(IProcessObserver processObserver);

		/** Returns true if the given UID is registered as an active instrumentation. */
		public abstract boolean isActiveInstrumentation(int uid);
		}

+1 −6

Original line number	Diff line number	Diff line
		@@ -41,8 +41,7 @@ final class DisabledWallpaperManager extends WallpaperManager {
		// Don't need to worry about synchronization
		private static DisabledWallpaperManager sInstance;

		// TODO(b/138939803): STOPSHIP changed to false and/or remove it
		private static final boolean DEBUG = true;
		private static final boolean DEBUG = false;

		@NonNull
		static DisabledWallpaperManager getInstance() {
		@@ -66,10 +65,6 @@ final class DisabledWallpaperManager extends WallpaperManager {
		return false;
		}

		// TODO(b/138939803): STOPSHIP methods below should not be necessary,
		// callers should check if isWallpaperSupported(), consider removing them to keep this class
		// simpler

		private static <T> T unsupported() {
		if (DEBUG) Log.w(TAG, "unsupported method called; returning null", new Exception());
		return null;

+4 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,9 @@ import android.view.WindowManagerImpl;
		* The display manager keeps track of all displays in the system. However, not all
		* displays are appropriate for showing presentations. For example, if an activity
		* attempted to show a presentation on the main display it might obscure its own content
		* (it's like opening a dialog on top of your activity).
		* (it's like opening a dialog on top of your activity). Creating a presentation on the main
		* display will result in {@link android.view.WindowManager.InvalidDisplayException} being thrown
		* when invoking {@link #show()}.
		* </p><p>
		* Here's how to identify suitable displays for showing presentations using
		* {@link DisplayManager#getDisplays(String)} and the
		@@ -243,7 +245,7 @@ public class Presentation extends Dialog {
		/**
		* Inherited from {@link Dialog#show}. Will throw
		* {@link android.view.WindowManager.InvalidDisplayException} if the specified secondary
		* {@link Display} can't be found.
		* {@link Display} can't be found or if it does not have {@link Display#FLAG_PRESENTATION} set.
		*/
		@Override
		public void show() {