Snap for 6206628 from eab74f8e20dd2a090c75205670acdb1dfe390d92 to qt-qpr3-release (92d90249) · 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,

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@
		android:id="@+id/notification_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/notification_shade_background_color">
		android:background="@color/notification_shade_background_color"
		android:visibility="invisible">

		<View
		android:id="@+id/glass_pane"

+8 −0

Original line number	Diff line number	Diff line
		@@ -1092,6 +1092,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		}

		mNavigationBarWindow.setVisibility(isKeyboardVisible ? View.GONE : View.VISIBLE);
		setNotificationViewBottomMargin(isKeyboardVisible ? 0 : mNavigationBarWindow.getHeight());
		mBottomNavBarVisible = !isKeyboardVisible;
		}

		@@ -1155,6 +1156,13 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		addTemperatureViewToController(mRightNavigationBarView);
		}

		private void setNotificationViewBottomMargin(int bottomMargin) {
		ViewGroup.MarginLayoutParams params =
		(ViewGroup.MarginLayoutParams) mNotificationView.getLayoutParams();
		params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, bottomMargin);
		mNotificationView.setLayoutParams(params);
		}

		@Override
		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		//When executing dump() function simultaneously, we need to serialize them

+0 −3

Original line number	Diff line number	Diff line
		@@ -4404,7 +4404,6 @@ public class AccountManagerService
		return true;
		}

		@Override
		public boolean renameSharedAccountAsUser(Account account, String newName, int userId) {
		userId = handleIncomingUser(userId);
		UserAccounts accounts = getUserAccounts(userId);
		@@ -4420,7 +4419,6 @@ public class AccountManagerService
		return r > 0;
		}

		@Override
		public boolean removeSharedAccountAsUser(Account account, int userId) {
		return removeSharedAccountAsUser(account, userId, getCallingUid());
		}
		@@ -4438,7 +4436,6 @@ public class AccountManagerService
		return deleted;
		}

		@Override
		public Account[] getSharedAccountsAsUser(int userId) {
		userId = handleIncomingUser(userId);
		UserAccounts accounts = getUserAccounts(userId);