Skip to content

Commit 64a55af

Browse files
author
Jeff Brown
committed
Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession to use more consistent naming and structure. Added JNI for all of the new surface flinger display API calls. Enforced the requirement that all Surfaces created by the window manager be named. Updated the display manager service to use the new methods. Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
1 parent 0b722fe commit 64a55af

34 files changed

+1427
-1072
lines changed

api/current.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6475,6 +6475,7 @@ package android.content.pm {
64756475
method public abstract int checkSignatures(int, int);
64766476
method public abstract void clearPackagePreferredActivities(java.lang.String);
64776477
method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
6478+
method public abstract void extendVerificationTimeout(int, int, long);
64786479
method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
64796480
method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
64806481
method public abstract android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -6533,7 +6534,6 @@ package android.content.pm {
65336534
method public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);
65346535
method public abstract void setInstallerPackageName(java.lang.String, java.lang.String);
65356536
method public abstract void verifyPendingInstall(int, int);
6536-
method public abstract void extendVerificationTimeout(int, int, long);
65376537
field public static final int COMPONENT_ENABLED_STATE_DEFAULT = 0; // 0x0
65386538
field public static final int COMPONENT_ENABLED_STATE_DISABLED = 2; // 0x2
65396539
field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
@@ -6594,6 +6594,7 @@ package android.content.pm {
65946594
field public static final int GET_UNINSTALLED_PACKAGES = 8192; // 0x2000
65956595
field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
65966596
field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
6597+
field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
65976598
field public static final int PERMISSION_DENIED = -1; // 0xffffffff
65986599
field public static final int PERMISSION_GRANTED = 0; // 0x0
65996600
field public static final int SIGNATURE_FIRST_NOT_SIGNED = -1; // 0xffffffff
@@ -6604,7 +6605,6 @@ package android.content.pm {
66046605
field public static final int SIGNATURE_UNKNOWN_PACKAGE = -4; // 0xfffffffc
66056606
field public static final int VERIFICATION_ALLOW = 1; // 0x1
66066607
field public static final int VERIFICATION_REJECT = -1; // 0xffffffff
6607-
field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80
66086608
}
66096609

66106610
public static class PackageManager.NameNotFoundException extends android.util.AndroidException {
@@ -20069,8 +20069,8 @@ package android.service.dreams {
2006920069
method public void setContentView(android.view.View);
2007020070
method public void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);
2007120071
method public void setInteractive(boolean);
20072-
field public static final java.lang.String SERVICE_INTERFACE = "android.service.dreams.Dream";
2007320072
field public static final java.lang.String METADATA_NAME_CONFIG_ACTIVITY = "android.service.dreams.config_activity";
20073+
field public static final java.lang.String SERVICE_INTERFACE = "android.service.dreams.Dream";
2007420074
}
2007520075

2007620076
}
@@ -21328,6 +21328,7 @@ package android.test.mock {
2132821328
method public int checkSignatures(int, int);
2132921329
method public void clearPackagePreferredActivities(java.lang.String);
2133021330
method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
21331+
method public void extendVerificationTimeout(int, int, long);
2133121332
method public android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
2133221333
method public android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
2133321334
method public android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -21385,7 +21386,6 @@ package android.test.mock {
2138521386
method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
2138621387
method public void setInstallerPackageName(java.lang.String, java.lang.String);
2138721388
method public void verifyPendingInstall(int, int);
21388-
method public void extendVerificationTimeout(int, int, long);
2138921389
}
2139021390

2139121391
public class MockResources extends android.content.res.Resources {
@@ -24422,7 +24422,7 @@ package android.view {
2442224422
method public android.graphics.Canvas lockCanvas(android.graphics.Rect) throws java.lang.IllegalArgumentException, android.view.Surface.OutOfResourcesException;
2442324423
method public void readFromParcel(android.os.Parcel);
2442424424
method public void release();
24425-
method public void unlockCanvas(android.graphics.Canvas);
24425+
method public deprecated void unlockCanvas(android.graphics.Canvas);
2442624426
method public void unlockCanvasAndPost(android.graphics.Canvas);
2442724427
method public void writeToParcel(android.os.Parcel, int);
2442824428
field public static final android.os.Parcelable.Creator CREATOR;

0 commit comments

Comments
 (0)