Snap for 7474906 from 304a868b6b37e0168da25ac24092b0be466621f8 to sc-release (c8f0fe5a) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -11871,7 +11871,19 @@ public class DevicePolicyManager {
		public boolean isAffiliatedUser() {
		throwIfParentInstance("isAffiliatedUser");
		try {
		return mService.isAffiliatedUser();
		return mService.isCallingUserAffiliated();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* @hide
		* Returns whether target user is affiliated with the device.
		*/
		public boolean isAffiliatedUser(@UserIdInt int userId) {
		try {
		return mService.isAffiliatedUser(userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -390,7 +390,8 @@ interface IDevicePolicyManager {

		void setAffiliationIds(in ComponentName admin, in List<String> ids);
		List<String> getAffiliationIds(in ComponentName admin);
		boolean isAffiliatedUser();
		boolean isCallingUserAffiliated();
		boolean isAffiliatedUser(int userId);

		void setSecurityLoggingEnabled(in ComponentName admin, String packageName, boolean enabled);
		boolean isSecurityLoggingEnabled(in ComponentName admin, String packageName);

+4 −0

Original line number	Diff line number	Diff line
		@@ -524,8 +524,12 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		* owned ActivityContainer such as that within an ActivityView. If not set and
		* this activity is launched into such a container a SecurityException will be
		* thrown. Set from the {@link android.R.attr#allowEmbedded} attribute.
		*
		* @deprecated this flag is no longer needed since ActivityView is now fully removed
		* TODO(b/191165536): delete this flag since is no longer used
		*/
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@Deprecated
		public static final int FLAG_ALLOW_EMBEDDED = 0x80000000;

		/**

+1 −2

Original line number	Diff line number	Diff line
		@@ -20703,8 +20703,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		/**
		* Return the window this view is currently attached to. Used in
		* {@link android.app.ActivityView} to communicate with WM.
		* Return the window this view is currently attached to.
		* @hide
		*/
		protected IWindow getWindow() {

+1 −1

Original line number	Diff line number	Diff line
		@@ -1019,7 +1019,7 @@
		<string name="text_copied" msgid="2531420577879738860">"Teks na knipbord gekopieër."</string>
		<string name="copied" msgid="4675902854553014676">"Gekopieer"</string>
		<string name="pasted_from_app" msgid="5627698450808256545">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> het uit <xliff:g id="SOURCE_APP_NAME">%2$s</xliff:g> geplak"</string>
		<string name="pasted_from_clipboard" msgid="7355790625710831847">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> van jou knipbord af geplak"</string>
		<string name="pasted_from_clipboard" msgid="7355790625710831847">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> het van jou knipbord af geplak"</string>
		<string name="pasted_text" msgid="4298871641549173733">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> het teks geplak wat jy gekopieer het"</string>
		<string name="pasted_image" msgid="4729097394781491022">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> het \'n prent geplak wat jy gekopieer het"</string>
		<string name="pasted_content" msgid="646276353060777131">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> het inhoud geplak wat jy gekopieer het"</string>