Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update doc to allow system image app to display terms in ManagedProvisioning

Browse Source 
Bug: 34320095
Test: javadoc update only. built successfully
Change-Id: I9f023a12adbbd5f3d5ed3594508642b8dd573896
This commit is contained in:
Victor Chang
2017-01-27 11:51:56 +00:00
parent c850137cf5
commit 98607130fe
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -34,6 +34,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ParceledListSlice;
@@ -909,6 +910,16 @@ public class DevicePolicyManager {
* or the organization name.
*
* <p> Use in Bundle {@link #EXTRA_PROVISIONING_DISCLAIMERS}
*
* <p> System app, i.e. application with {@link ApplicationInfo#FLAG_SYSTEM}, can also insert a
* disclaimer by declaring an application-level meta-data in {@code AndroidManifest.xml}.
* Must use it with {@link #EXTRA_PROVISIONING_DISCLAIMER_CONTENT}. Here is the example:
*
* <pre>
* &lt;meta-data
* android:name="android.app.extra.PROVISIONING_DISCLAIMER_HEADER"
* android:resource="@string/disclaimer_header"
* /&gt;</pre>
*/
public static final String EXTRA_PROVISIONING_DISCLAIMER_HEADER =
"android.app.extra.PROVISIONING_DISCLAIMER_HEADER";
@@ -931,6 +942,16 @@ public class DevicePolicyManager {
* {@link android.content.ClipData} of the intent too.
*
* <p> Use in Bundle {@link #EXTRA_PROVISIONING_DISCLAIMERS}
*
* <p> System app, i.e. application with {@link ApplicationInfo#FLAG_SYSTEM}, can also insert a
* disclaimer by declaring an application-level meta-data in {@code AndroidManifest.xml}.
* Must use it with {@link #EXTRA_PROVISIONING_DISCLAIMER_HEADER}. Here is the example:
*
* <pre>
* &lt;meta-data
* android:name="android.app.extra.PROVISIONING_DISCLAIMER_CONTENT"
* android:resource="@string/disclaimer_content"
* /&gt;</pre>
*/
public static final String EXTRA_PROVISIONING_DISCLAIMER_CONTENT =
"android.app.extra.PROVISIONING_DISCLAIMER_CONTENT";