Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b737c716 authored Feb 23, 2016 by Philipp Weiß Committed by android-build-merger Feb 23, 2016

Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev

am: f398479e

* commit 'f398479e':
  Remove deprecated APIs DPM.createUser, createAndInitializeUser

parents 5e43dcfc f398479e

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -5830,9 +5830,7 @@ package android.app.admin {
		method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
		method public void clearProfileOwner(android.content.ComponentName);
		method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public android.os.UserHandle createAndManageUser(android.content.ComponentName, java.lang.String, android.content.ComponentName, android.os.PersistableBundle, int);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public void enableSystemApp(android.content.ComponentName, java.lang.String);
		method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
		method public java.lang.String[] getAccountTypesWithManagementDisabled();

api/removed.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ package android.app {
		package android.app.admin {

		public class DevicePolicyManager {
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getDeviceInitializerApp();
		method public deprecated android.content.ComponentName getDeviceInitializerComponent();
		}

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -5967,9 +5967,7 @@ package android.app.admin {
		method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
		method public void clearProfileOwner(android.content.ComponentName);
		method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public android.os.UserHandle createAndManageUser(android.content.ComponentName, java.lang.String, android.content.ComponentName, android.os.PersistableBundle, int);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public void enableSystemApp(android.content.ComponentName, java.lang.String);
		method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
		method public java.lang.String[] getAccountTypesWithManagementDisabled();

api/system-removed.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,15 @@ package android.app {

		}

		package android.app.admin {

		public class DevicePolicyManager {
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		}

		}

		package android.content.pm {

		public class PackageInfo implements android.os.Parcelable {

api/test-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -5832,9 +5832,7 @@ package android.app.admin {
		method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
		method public void clearProfileOwner(android.content.ComponentName);
		method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
		method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);
		method public android.os.UserHandle createAndManageUser(android.content.ComponentName, java.lang.String, android.content.ComponentName, android.os.PersistableBundle, int);
		method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
		method public void enableSystemApp(android.content.ComponentName, java.lang.String);
		method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
		method public java.lang.String[] getAccountTypesWithManagementDisabled();