diff options
150 files changed, 4391 insertions, 1843 deletions
diff --git a/apct-tests/perftests/core/src/android/text/BoringLayoutCreateDrawPerfTest.java b/apct-tests/perftests/core/src/android/text/BoringLayoutCreateDrawPerfTest.java index 47dd257b06b5..586c3852325a 100644 --- a/apct-tests/perftests/core/src/android/text/BoringLayoutCreateDrawPerfTest.java +++ b/apct-tests/perftests/core/src/android/text/BoringLayoutCreateDrawPerfTest.java @@ -46,7 +46,7 @@ public class BoringLayoutCreateDrawPerfTest { private static final float SPACING_ADD = 10f; private static final float SPACING_MULT = 1.5f; - @Parameterized.Parameters(name = "cached={3},{1} chars,{0}") + @Parameterized.Parameters(name = "cached={3},{1}chars,{0}") public static Collection cases() { final List<Object[]> params = new ArrayList<>(); for (int length : new int[]{128}) { diff --git a/apct-tests/perftests/core/src/android/text/BoringLayoutIsBoringPerfTest.java b/apct-tests/perftests/core/src/android/text/BoringLayoutIsBoringPerfTest.java index 34de65de2627..9d11f29557d2 100644 --- a/apct-tests/perftests/core/src/android/text/BoringLayoutIsBoringPerfTest.java +++ b/apct-tests/perftests/core/src/android/text/BoringLayoutIsBoringPerfTest.java @@ -40,7 +40,7 @@ public class BoringLayoutIsBoringPerfTest { private static final boolean[] BOOLEANS = new boolean[]{false, true}; - @Parameterized.Parameters(name = "cached={4},{1} chars,{0}") + @Parameterized.Parameters(name = "cached={4},{1}chars,{0}") public static Collection cases() { final List<Object[]> params = new ArrayList<>(); for (int length : new int[]{128}) { diff --git a/apct-tests/perftests/core/src/android/text/PaintMeasureDrawPerfTest.java b/apct-tests/perftests/core/src/android/text/PaintMeasureDrawPerfTest.java index 00b60add5b15..676879857491 100644 --- a/apct-tests/perftests/core/src/android/text/PaintMeasureDrawPerfTest.java +++ b/apct-tests/perftests/core/src/android/text/PaintMeasureDrawPerfTest.java @@ -42,7 +42,7 @@ public class PaintMeasureDrawPerfTest { private static final boolean[] BOOLEANS = new boolean[]{false, true}; - @Parameterized.Parameters(name = "cached={1},{0} chars") + @Parameterized.Parameters(name = "cached={1},{0}chars") public static Collection cases() { final List<Object[]> params = new ArrayList<>(); for (int length : new int[]{128}) { diff --git a/apct-tests/perftests/core/src/android/text/StaticLayoutCreateDrawPerfTest.java b/apct-tests/perftests/core/src/android/text/StaticLayoutCreateDrawPerfTest.java index 356e2e0dab3c..bfdb7589bdff 100644 --- a/apct-tests/perftests/core/src/android/text/StaticLayoutCreateDrawPerfTest.java +++ b/apct-tests/perftests/core/src/android/text/StaticLayoutCreateDrawPerfTest.java @@ -50,7 +50,7 @@ public class StaticLayoutCreateDrawPerfTest { @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); - @Parameterized.Parameters(name = "cached={3},{1} chars,{0}") + @Parameterized.Parameters(name = "cached={3},{1}chars,{0}") public static Collection cases() { final List<Object[]> params = new ArrayList<>(); for (int length : new int[]{128}) { diff --git a/apct-tests/perftests/core/src/android/text/TextViewSetTextMeasurePerfTest.java b/apct-tests/perftests/core/src/android/text/TextViewSetTextMeasurePerfTest.java index a2bf33e1f607..ff2d57edb11b 100644 --- a/apct-tests/perftests/core/src/android/text/TextViewSetTextMeasurePerfTest.java +++ b/apct-tests/perftests/core/src/android/text/TextViewSetTextMeasurePerfTest.java @@ -40,7 +40,7 @@ import java.util.Locale; import java.util.Random; /** - * Performance test for multi line, single style {@link StaticLayout} creation/draw. + * Performance test for {@link TextView} measure/draw. */ @LargeTest @RunWith(Parameterized.class) @@ -51,7 +51,7 @@ public class TextViewSetTextMeasurePerfTest { @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); - @Parameterized.Parameters(name = "cached={3},{1} chars,{0}") + @Parameterized.Parameters(name = "cached={3},{1}chars,{0}") public static Collection cases() { final List<Object[]> params = new ArrayList<>(); for (int length : new int[]{128}) { diff --git a/api/current.txt b/api/current.txt index 9bbdee155872..df9438cbf525 100644 --- a/api/current.txt +++ b/api/current.txt @@ -362,6 +362,7 @@ package android { field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 + field public static final int cantSaveState = 16844142; // 0x101056e field public static final deprecated int capitalize = 16843113; // 0x1010169 field public static final int category = 16843752; // 0x10103e8 field public static final int centerBright = 16842956; // 0x10100cc @@ -45745,8 +45746,8 @@ package android.view { method protected boolean awakenScrollBars(int); method protected boolean awakenScrollBars(int, boolean); method public void bringToFront(); - method public void buildDrawingCache(); - method public void buildDrawingCache(boolean); + method public deprecated void buildDrawingCache(); + method public deprecated void buildDrawingCache(boolean); method public void buildLayer(); method public boolean callOnClick(); method public boolean canResolveLayoutDirection(); @@ -45771,7 +45772,7 @@ package android.view { method protected int computeVerticalScrollRange(); method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(); method public void createContextMenu(android.view.ContextMenu); - method public void destroyDrawingCache(); + method public deprecated void destroyDrawingCache(); method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets); method public boolean dispatchCapturedPointerEvent(android.view.MotionEvent); method public void dispatchConfigurationChanged(android.content.res.Configuration); @@ -45852,10 +45853,10 @@ package android.view { method public static int getDefaultSize(int, int); method public android.view.Display getDisplay(); method public final int[] getDrawableState(); - method public android.graphics.Bitmap getDrawingCache(); - method public android.graphics.Bitmap getDrawingCache(boolean); - method public int getDrawingCacheBackgroundColor(); - method public int getDrawingCacheQuality(); + method public deprecated android.graphics.Bitmap getDrawingCache(); + method public deprecated android.graphics.Bitmap getDrawingCache(boolean); + method public deprecated int getDrawingCacheBackgroundColor(); + method public deprecated int getDrawingCacheQuality(); method public void getDrawingRect(android.graphics.Rect); method public long getDrawingTime(); method public float getElevation(); @@ -45994,7 +45995,7 @@ package android.view { method public boolean isClickable(); method public boolean isContextClickable(); method public boolean isDirty(); - method public boolean isDrawingCacheEnabled(); + method public deprecated boolean isDrawingCacheEnabled(); method public boolean isDuplicateParentStateEnabled(); method public boolean isEnabled(); method public final boolean isFocusable(); @@ -46165,9 +46166,9 @@ package android.view { method public void setContentDescription(java.lang.CharSequence); method public void setContextClickable(boolean); method public void setDefaultFocusHighlightEnabled(boolean); - method public void setDrawingCacheBackgroundColor(int); - method public void setDrawingCacheEnabled(boolean); - method public void setDrawingCacheQuality(int); + method public deprecated void setDrawingCacheBackgroundColor(int); + method public deprecated void setDrawingCacheEnabled(boolean); + method public deprecated void setDrawingCacheQuality(int); method public void setDuplicateParentStateEnabled(boolean); method public void setElevation(float); method public void setEnabled(boolean); @@ -46318,9 +46319,9 @@ package android.view { field public static final int DRAG_FLAG_GLOBAL_URI_READ = 1; // 0x1 field public static final int DRAG_FLAG_GLOBAL_URI_WRITE = 2; // 0x2 field public static final int DRAG_FLAG_OPAQUE = 512; // 0x200 - field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 - field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 - field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 + field public static final deprecated int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 + field public static final deprecated int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 + field public static final deprecated int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 field protected static final int[] EMPTY_STATE_SET; field protected static final int[] ENABLED_FOCUSED_SELECTED_STATE_SET; field protected static final int[] ENABLED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET; @@ -46712,7 +46713,7 @@ package android.view { method public android.animation.LayoutTransition getLayoutTransition(); method public int getNestedScrollAxes(); method public android.view.ViewGroupOverlay getOverlay(); - method public int getPersistentDrawingCache(); + method public deprecated int getPersistentDrawingCache(); method public boolean getTouchscreenBlocksFocus(); method public int indexOfChild(android.view.View); method public final deprecated void invalidateChild(android.view.View, android.graphics.Rect); @@ -46765,7 +46766,7 @@ package android.view { method public void setAddStatesFromChildren(boolean); method public deprecated void setAlwaysDrawnWithCacheEnabled(boolean); method public deprecated void setAnimationCacheEnabled(boolean); - method protected void setChildrenDrawingCacheEnabled(boolean); + method protected deprecated void setChildrenDrawingCacheEnabled(boolean); method protected void setChildrenDrawingOrderEnabled(boolean); method protected deprecated void setChildrenDrawnWithCacheEnabled(boolean); method public void setClipChildren(boolean); @@ -46777,7 +46778,7 @@ package android.view { method public void setLayoutTransition(android.animation.LayoutTransition); method public void setMotionEventSplittingEnabled(boolean); method public void setOnHierarchyChangeListener(android.view.ViewGroup.OnHierarchyChangeListener); - method public void setPersistentDrawingCache(int); + method public deprecated void setPersistentDrawingCache(int); method protected void setStaticTransformationsEnabled(boolean); method public void setTouchscreenBlocksFocus(boolean); method public void setTransitionGroup(boolean); @@ -46795,10 +46796,10 @@ package android.view { field public static final int FOCUS_BLOCK_DESCENDANTS = 393216; // 0x60000 field public static final int LAYOUT_MODE_CLIP_BOUNDS = 0; // 0x0 field public static final int LAYOUT_MODE_OPTICAL_BOUNDS = 1; // 0x1 - field public static final int PERSISTENT_ALL_CACHES = 3; // 0x3 - field public static final int PERSISTENT_ANIMATION_CACHE = 1; // 0x1 - field public static final int PERSISTENT_NO_CACHE = 0; // 0x0 - field public static final int PERSISTENT_SCROLLING_CACHE = 2; // 0x2 + field public static final deprecated int PERSISTENT_ALL_CACHES = 3; // 0x3 + field public static final deprecated int PERSISTENT_ANIMATION_CACHE = 1; // 0x1 + field public static final deprecated int PERSISTENT_NO_CACHE = 0; // 0x0 + field public static final deprecated int PERSISTENT_SCROLLING_CACHE = 2; // 0x2 } public static class ViewGroup.LayoutParams { diff --git a/api/system-current.txt b/api/system-current.txt index ea077fe62aee..752e0beb506b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -494,6 +494,7 @@ package android { field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 + field public static final int cantSaveState = 16844142; // 0x101056e field public static final deprecated int capitalize = 16843113; // 0x1010169 field public static final int category = 16843752; // 0x10103e8 field public static final int centerBright = 16842956; // 0x10100cc @@ -27217,7 +27218,6 @@ package android.media.tv { } public static final class TvInputManager.Hardware { - method public boolean dispatchKeyEventToHdmi(android.view.KeyEvent); method public void overrideAudioSink(int, java.lang.String, int, int, int); method public void setStreamVolume(float); method public boolean setSurface(android.view.Surface, android.media.tv.TvStreamConfig); @@ -49471,8 +49471,8 @@ package android.view { method protected boolean awakenScrollBars(int); method protected boolean awakenScrollBars(int, boolean); method public void bringToFront(); - method public void buildDrawingCache(); - method public void buildDrawingCache(boolean); + method public deprecated void buildDrawingCache(); + method public deprecated void buildDrawingCache(boolean); method public void buildLayer(); method public boolean callOnClick(); method public boolean canResolveLayoutDirection(); @@ -49497,7 +49497,7 @@ package android.view { method protected int computeVerticalScrollRange(); method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(); method public void createContextMenu(android.view.ContextMenu); - method public void destroyDrawingCache(); + method public deprecated void destroyDrawingCache(); method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets); method public boolean dispatchCapturedPointerEvent(android.view.MotionEvent); method public void dispatchConfigurationChanged(android.content.res.Configuration); @@ -49578,10 +49578,10 @@ package android.view { method public static int getDefaultSize(int, int); method public android.view.Display getDisplay(); method public final int[] getDrawableState(); - method public android.graphics.Bitmap getDrawingCache(); - method public android.graphics.Bitmap getDrawingCache(boolean); - method public int getDrawingCacheBackgroundColor(); - method public int getDrawingCacheQuality(); + method public deprecated android.graphics.Bitmap getDrawingCache(); + method public deprecated android.graphics.Bitmap getDrawingCache(boolean); + method public deprecated int getDrawingCacheBackgroundColor(); + method public deprecated int getDrawingCacheQuality(); method public void getDrawingRect(android.graphics.Rect); method public long getDrawingTime(); method public float getElevation(); @@ -49720,7 +49720,7 @@ package android.view { method public boolean isClickable(); method public boolean isContextClickable(); method public boolean isDirty(); - method public boolean isDrawingCacheEnabled(); + method public deprecated boolean isDrawingCacheEnabled(); method public boolean isDuplicateParentStateEnabled(); method public boolean isEnabled(); method public final boolean isFocusable(); @@ -49891,9 +49891,9 @@ package android.view { method public void setContentDescription(java.lang.CharSequence); method public void setContextClickable(boolean); method public void setDefaultFocusHighlightEnabled(boolean); - method public void setDrawingCacheBackgroundColor(int); - method public void setDrawingCacheEnabled(boolean); - method public void setDrawingCacheQuality(int); + method public deprecated void setDrawingCacheBackgroundColor(int); + method public deprecated void setDrawingCacheEnabled(boolean); + method public deprecated void setDrawingCacheQuality(int); method public void setDuplicateParentStateEnabled(boolean); method public void setElevation(float); method public void setEnabled(boolean); @@ -50044,9 +50044,9 @@ package android.view { field public static final int DRAG_FLAG_GLOBAL_URI_READ = 1; // 0x1 field public static final int DRAG_FLAG_GLOBAL_URI_WRITE = 2; // 0x2 field public static final int DRAG_FLAG_OPAQUE = 512; // 0x200 - field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 - field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 - field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 + field public static final deprecated int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 + field public static final deprecated int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 + field public static final deprecated int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 field protected static final int[] EMPTY_STATE_SET; field protected static final int[] ENABLED_FOCUSED_SELECTED_STATE_SET; field protected static final int[] ENABLED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET; @@ -50438,7 +50438,7 @@ package android.view { method public android.animation.LayoutTransition getLayoutTransition(); method public int getNestedScrollAxes(); method public android.view.ViewGroupOverlay getOverlay(); - method public int getPersistentDrawingCache(); + method public deprecated int getPersistentDrawingCache(); method public boolean getTouchscreenBlocksFocus(); method public int indexOfChild(android.view.View); method public final deprecated void invalidateChild(android.view.View, android.graphics.Rect); @@ -50491,7 +50491,7 @@ package android.view { method public void setAddStatesFromChildren(boolean); method public deprecated void setAlwaysDrawnWithCacheEnabled(boolean); method public deprecated void setAnimationCacheEnabled(boolean); - method protected void setChildrenDrawingCacheEnabled(boolean); + method protected deprecated void setChildrenDrawingCacheEnabled(boolean); method protected void setChildrenDrawingOrderEnabled(boolean); method protected deprecated void setChildrenDrawnWithCacheEnabled(boolean); method public void setClipChildren(boolean); @@ -50503,7 +50503,7 @@ package android.view { method public void setLayoutTransition(android.animation.LayoutTransition); method public void setMotionEventSplittingEnabled(boolean); method public void setOnHierarchyChangeListener(android.view.ViewGroup.OnHierarchyChangeListener); - method public void setPersistentDrawingCache(int); + method public deprecated void setPersistentDrawingCache(int); method protected void setStaticTransformationsEnabled(boolean); method public void setTouchscreenBlocksFocus(boolean); method public void setTransitionGroup(boolean); @@ -50521,10 +50521,10 @@ package android.view { field public static final int FOCUS_BLOCK_DESCENDANTS = 393216; // 0x60000 field public static final int LAYOUT_MODE_CLIP_BOUNDS = 0; // 0x0 field public static final int LAYOUT_MODE_OPTICAL_BOUNDS = 1; // 0x1 - field public static final int PERSISTENT_ALL_CACHES = 3; // 0x3 - field public static final int PERSISTENT_ANIMATION_CACHE = 1; // 0x1 - field public static final int PERSISTENT_NO_CACHE = 0; // 0x0 - field public static final int PERSISTENT_SCROLLING_CACHE = 2; // 0x2 + field public static final deprecated int PERSISTENT_ALL_CACHES = 3; // 0x3 + field public static final deprecated int PERSISTENT_ANIMATION_CACHE = 1; // 0x1 + field public static final deprecated int PERSISTENT_NO_CACHE = 0; // 0x0 + field public static final deprecated int PERSISTENT_SCROLLING_CACHE = 2; // 0x2 } public static class ViewGroup.LayoutParams { diff --git a/api/system-removed.txt b/api/system-removed.txt index 7ee261e88fc7..639877fae6e2 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -275,6 +275,10 @@ package android.media.tv { method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo); } + public static final class TvInputManager.Hardware { + method public boolean dispatchKeyEventToHdmi(android.view.KeyEvent); + } + public class TvView extends android.view.ViewGroup { method public void requestUnblockContent(android.media.tv.TvContentRating); } diff --git a/api/test-current.txt b/api/test-current.txt index fe861e1078bd..08b297bad41d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -362,6 +362,7 @@ package android { field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 + field public static final int cantSaveState = 16844142; // 0x101056e field public static final deprecated int capitalize = 16843113; // 0x1010169 field public static final int category = 16843752; // 0x10103e8 field public static final int centerBright = 16842956; // 0x10100cc @@ -46315,8 +46316,8 @@ package android.view { method protected boolean awakenScrollBars(int); method protected boolean awakenScrollBars(int, boolean); method public void bringToFront(); - method public void buildDrawingCache(); - method public void buildDrawingCache(boolean); + method public deprecated void buildDrawingCache(); + method public deprecated void buildDrawingCache(boolean); method public void buildLayer(); method public boolean callOnClick(); method public boolean canResolveLayoutDirection(); @@ -46341,7 +46342,7 @@ package android.view { method protected int computeVerticalScrollRange(); method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(); method public void createContextMenu(android.view.ContextMenu); - method public void destroyDrawingCache(); + method public deprecated void destroyDrawingCache(); method public android.view.WindowInsets dispatchApplyWindowInsets(android.view.WindowInsets); method public boolean dispatchCapturedPointerEvent(android.view.MotionEvent); method public void dispatchConfigurationChanged(android.content.res.Configuration); @@ -46422,10 +46423,10 @@ package android.view { method public static int getDefaultSize(int, int); method public android.view.Display getDisplay(); method public final int[] getDrawableState(); - method public android.graphics.Bitmap getDrawingCache(); - method public android.graphics.Bitmap getDrawingCache(boolean); - method public int getDrawingCacheBackgroundColor(); - method public int getDrawingCacheQuality(); + method public deprecated android.graphics.Bitmap getDrawingCache(); + method public deprecated android.graphics.Bitmap getDrawingCache(boolean); + method public deprecated int getDrawingCacheBackgroundColor(); + method public deprecated int getDrawingCacheQuality(); method public void getDrawingRect(android.graphics.Rect); method public long getDrawingTime(); method public float getElevation(); @@ -46566,7 +46567,7 @@ package android.view { method public boolean isContextClickable(); method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable); method public boolean isDirty(); - method public boolean isDrawingCacheEnabled(); + method public deprecated boolean isDrawingCacheEnabled(); method public boolean isDuplicateParentStateEnabled(); method public boolean isEnabled(); method public final boolean isFocusable(); @@ -46740,9 +46741,9 @@ package android.view { method public void setContentDescription(java.lang.CharSequence); method public void setContextClickable(boolean); method public void setDefaultFocusHighlightEnabled(boolean); - method public void setDrawingCacheBackgroundColor(int); - method public void setDrawingCacheEnabled(boolean); - method public void setDrawingCacheQuality(int); + method public deprecated void setDrawingCacheBackgroundColor(int); + method public deprecated void setDrawingCacheEnabled(boolean); + method public deprecated void setDrawingCacheQuality(int); method public void setDuplicateParentStateEnabled(boolean); method public void setElevation(float); method public void setEnabled(boolean); @@ -46894,9 +46895,9 @@ package android.view { field public static final int DRAG_FLAG_GLOBAL_URI_READ = 1; // 0x1 field public static final int DRAG_FLAG_GLOBAL_URI_WRITE = 2; // 0x2 field public static final int DRAG_FLAG_OPAQUE = 512; // 0x200 - field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 - field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 - field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 + field public static final deprecated int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0 + field public static final deprecated int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000 + field public static final deprecated int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 field protected static final int[] EMPTY_STATE_SET; field protected static final int[] ENABLED_FOCUSED_SELECTED_STATE_SET; field protected static final int[] ENABLED_FOCUSED_SELECTED_WINDOW_FOCUSED_STATE_SET; @@ -47292,7 +47293,7 @@ package android.view { method public android.animation.LayoutTransition getLayoutTransition(); method public int getNestedScrollAxes(); method public android.view.ViewGroupOverlay getOverlay(); - method public int getPersistentDrawingCache(); + method public deprecated int getPersistentDrawingCache(); method public boolean getTouchscreenBlocksFocus(); method public int indexOfChild(android.view.View); method public final deprecated void invalidateChild(android.view.View, android.graphics.Rect); @@ -47345,7 +47346,7 @@ package android.view { method public void setAddStatesFromChildren(boolean); method public deprecated void setAlwaysDrawnWithCacheEnabled(boolean); method public deprecated void setAnimationCacheEnabled(boolean); - method protected void setChildrenDrawingCacheEnabled(boolean); + method protected deprecated void setChildrenDrawingCacheEnabled(boolean); method protected void setChildrenDrawingOrderEnabled(boolean); method protected deprecated void setChildrenDrawnWithCacheEnabled(boolean); method public void setClipChildren(boolean); @@ -47357,7 +47358,7 @@ package android.view { method public void setLayoutTransition(android.animation.LayoutTransition); method public void setMotionEventSplittingEnabled(boolean); method public void setOnHierarchyChangeListener(android.view.ViewGroup.OnHierarchyChangeListener); - method public void setPersistentDrawingCache(int); + method public deprecated void setPersistentDrawingCache(int); method protected void setStaticTransformationsEnabled(boolean); method public void setTouchscreenBlocksFocus(boolean); method public void setTransitionGroup(boolean); @@ -47375,10 +47376,10 @@ package android.view { field public static final int FOCUS_BLOCK_DESCENDANTS = 393216; // 0x60000 field public static final int LAYOUT_MODE_CLIP_BOUNDS = 0; // 0x0 field public static final int LAYOUT_MODE_OPTICAL_BOUNDS = 1; // 0x1 - field public static final int PERSISTENT_ALL_CACHES = 3; // 0x3 - field public static final int PERSISTENT_ANIMATION_CACHE = 1; // 0x1 - field public static final int PERSISTENT_NO_CACHE = 0; // 0x0 - field public static final int PERSISTENT_SCROLLING_CACHE = 2; // 0x2 + field public static final deprecated int PERSISTENT_ALL_CACHES = 3; // 0x3 + field public static final deprecated int PERSISTENT_ANIMATION_CACHE = 1; // 0x1 + field public static final deprecated int PERSISTENT_NO_CACHE = 0; // 0x0 + field public static final deprecated int PERSISTENT_SCROLLING_CACHE = 2; // 0x2 } public static class ViewGroup.LayoutParams { diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index b16188e9d82e..e5d35b3b8a0e 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -34,13 +34,6 @@ LOCAL_SRC_FILES += \ iot/BootAction.cpp \ iot/BootParameters.cpp \ -LOCAL_SHARED_LIBRARIES += \ - libandroidthings \ - libbase \ - libbinder \ - -LOCAL_STATIC_LIBRARIES += cpufeatures - else LOCAL_SRC_FILES += \ diff --git a/cmds/bootanimation/iot/iotbootanimation_main.cpp b/cmds/bootanimation/iot/iotbootanimation_main.cpp index 742f9c24f3a0..00cef430135e 100644 --- a/cmds/bootanimation/iot/iotbootanimation_main.cpp +++ b/cmds/bootanimation/iot/iotbootanimation_main.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "IotBootAnimation" -#include <android-base/file.h> +#include <base/files/file_util.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> #include <binder/ProcessState.h> @@ -31,13 +31,14 @@ #include "BootParameters.h" using namespace android; -using android::base::ReadFileToString; // Create a typedef for readability. typedef android::BootAnimation::Animation Animation; namespace { +constexpr const char* kDefaultLibName = "libbootaction.so"; + class BootActionAnimationCallbacks : public android::BootAnimation::Callbacks { public: BootActionAnimationCallbacks(std::unique_ptr<BootParameters> bootParameters) @@ -49,11 +50,13 @@ public: // This value is optionally provided by the user and will be written to // /oem/oem.prop. char property[PROP_VALUE_MAX] = {0}; - if (property_get("ro.oem.bootactions.lib", property, "") < 1) { - ALOGI("No bootaction specified"); + property_get("ro.oem.bootactions.lib", property, kDefaultLibName); + library_path += property; + + if (!::base::PathExists(::base::FilePath(library_path))) { + ALOGI("Skipping boot actions: %s does not exist", library_path.c_str()); return; } - library_path += property; mBootAction = new BootAction(); if (!mBootAction->init(library_path, mBootParameters->getParameters())) { diff --git a/cmds/incidentd/src/PrivacyBuffer.cpp b/cmds/incidentd/src/PrivacyBuffer.cpp index 07a064cf044b..37f6ed710cce 100644 --- a/cmds/incidentd/src/PrivacyBuffer.cpp +++ b/cmds/incidentd/src/PrivacyBuffer.cpp @@ -33,18 +33,18 @@ write_field_or_skip(EncodedBuffer::iterator* iter, EncodedBuffer* buf, uint8_t w { EncodedBuffer::Pointer snapshot = iter->rp()->copy(); size_t bytesToWrite = 0; - uint32_t varint = 0; + uint64_t varint = 0; switch (wireType) { case WIRE_TYPE_VARINT: varint = iter->readRawVarint(); - if(!skip) return buf->writeRawVarint(varint); + if(!skip) return buf->writeRawVarint64(varint); break; case WIRE_TYPE_FIXED64: bytesToWrite = 8; break; case WIRE_TYPE_LENGTH_DELIMITED: bytesToWrite = iter->readRawVarint(); - if(!skip) buf->writeRawVarint(bytesToWrite); + if(!skip) buf->writeRawVarint32(bytesToWrite); break; case WIRE_TYPE_FIXED32: bytesToWrite = 4; @@ -76,7 +76,6 @@ stripField(EncodedBuffer::iterator* iter, EncodedBuffer* buf, const Privacy* par uint8_t wireType = read_wire_type(varint); uint32_t fieldId = read_field_id(varint); const Privacy* policy = parentPolicy->lookup(fieldId); - if (policy == NULL || !policy->IsMessageType() || !policy->HasChildren()) { bool skip = !spec.CheckPremission(policy); size_t amt = buf->size(); @@ -99,7 +98,7 @@ stripField(EncodedBuffer::iterator* iter, EncodedBuffer* buf, const Privacy* par } buf->writeHeader(fieldId, wireType); - buf->writeRawVarint(finalSize); + buf->writeRawVarint32(finalSize); while (!q.empty()) { EncodedBuffer* subField = q.front(); EncodedBuffer::iterator it = subField->begin(); diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk index 24a598a5432a..4c95007b0c44 100644 --- a/cmds/statsd/Android.mk +++ b/cmds/statsd/Android.mk @@ -112,6 +112,7 @@ LOCAL_SRC_FILES := \ ../../core/java/android/os/IStatsCompanionService.aidl \ ../../core/java/android/os/IStatsManager.aidl \ src/StatsService.cpp \ + src/AnomalyMonitor.cpp \ src/stats_util.cpp \ src/LogEntryPrinter.cpp \ src/LogReader.cpp \ @@ -124,6 +125,7 @@ LOCAL_SRC_FILES := \ src/metrics/CountMetricProducer.cpp \ src/metrics/CountAnomalyTracker.cpp \ src/condition/condition_util.cpp \ + src/UidMap.cpp \ $(call all-cpp-files-under, tests) \ LOCAL_STATIC_LIBRARIES := \ diff --git a/cmds/statsd/src/AnomalyMonitor.cpp b/cmds/statsd/src/AnomalyMonitor.cpp index 92fe84487d4d..4fbbc7a2267f 100644 --- a/cmds/statsd/src/AnomalyMonitor.cpp +++ b/cmds/statsd/src/AnomalyMonitor.cpp @@ -90,6 +90,36 @@ void AnomalyMonitor::remove(sp<const AnomalyAlarm> alarm) { } } +// More efficient than repeatedly calling remove(mPq.top()) since it batches the +// updates to the registered alarm. +unordered_set<sp<const AnomalyAlarm>, SpHash<AnomalyAlarm>> + AnomalyMonitor::popSoonerThan(uint32_t timestampSec) { + + if (DEBUG) ALOGD("Removing alarms with time <= %u", timestampSec); + unordered_set<sp<const AnomalyAlarm>, SpHash<AnomalyAlarm>> oldAlarms; + std::lock_guard<std::mutex> lock(mLock); + + for (sp<const AnomalyAlarm> t = mPq.top(); + t != nullptr && t->timestampSec <= timestampSec; t = mPq.top()) { + oldAlarms.insert(t); + mPq.pop(); // remove t + } + // Always update registered alarm time (if anything has changed). + if (!oldAlarms.empty()) { + if (mPq.empty()) { + if (DEBUG) ALOGD("Queue is empty. Cancel any alarm."); + mRegisteredAlarmTimeSec = 0; + if (mStatsCompanionService != nullptr) { + mStatsCompanionService->cancelAnomalyAlarm(); + } + } else { + // Always update the registered alarm in this case (unlike remove()). + updateRegisteredAlarmTime_l(mPq.top()->timestampSec); + } + } + return oldAlarms; +} + void AnomalyMonitor::updateRegisteredAlarmTime_l(uint32_t timestampSec) { if (DEBUG) ALOGD("Updating reg alarm time to %u", timestampSec); mRegisteredAlarmTimeSec = timestampSec; diff --git a/cmds/statsd/src/AnomalyMonitor.h b/cmds/statsd/src/AnomalyMonitor.h index d78be5460572..7c6e5e8945a7 100644 --- a/cmds/statsd/src/AnomalyMonitor.h +++ b/cmds/statsd/src/AnomalyMonitor.h @@ -21,12 +21,14 @@ #include <indexed_priority_queue.h> #include <utils/RefBase.h> +#include <unordered_set> #include <queue> #include <vector> using namespace android; using android::os::IStatsCompanionService; +using std::unordered_set; namespace android { namespace os { @@ -86,6 +88,13 @@ public: void remove(sp<const AnomalyAlarm> alarm); /** + * Returns and removes all alarms whose timestamp <= the given timestampSec. + * Always updates the registered alarm if return is non-empty. + */ + unordered_set<sp<const AnomalyAlarm>, SpHash<AnomalyAlarm>> + popSoonerThan(uint32_t timestampSec); + + /** * Returns the projected alarm timestamp that is registered with * StatsCompanionService. This may not be equal to the soonest alarm, * but should be within minDiffToUpdateRegisteredAlarmTimeSec of it. diff --git a/core/tests/coretests/src/android/print/mockservice/PrintServiceCallbacks.java b/cmds/statsd/src/PackageInfoListener.h index 4e892072f0cb..476c1d953cbc 100644 --- a/core/tests/coretests/src/android/print/mockservice/PrintServiceCallbacks.java +++ b/cmds/statsd/src/PackageInfoListener.h @@ -14,26 +14,25 @@ * limitations under the License. */ -package android.print.mockservice; +#ifndef STATSD_PACKAGE_INFO_LISTENER_H +#define STATSD_PACKAGE_INFO_LISTENER_H -import android.printservice.PrintJob; -import android.printservice.PrintService; +#include <utils/RefBase.h> +#include <string> -public abstract class PrintServiceCallbacks { +namespace android { +namespace os { +namespace statsd { - private PrintService mService; +class PackageInfoListener : public virtual android::RefBase { +public: + // Uid map will notify this listener that the app with apk name and uid has been upgraded to + // the specified version. + virtual void notifyAppUpgrade(const std::string& apk, const int uid, const int version) = 0; +}; - public PrintService getService() { - return mService; - } +} // namespace statsd +} // namespace os +} // namespace android - public void setService(PrintService service) { - mService = service; - } - - public abstract PrinterDiscoverySessionCallbacks onCreatePrinterDiscoverySessionCallbacks(); - - public abstract void onRequestCancelPrintJob(PrintJob printJob); - - public abstract void onPrintJobQueued(PrintJob printJob); -} +#endif //STATSD_PACKAGE_INFO_LISTENER_H diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index 1d2f586c42dc..f877ef30432c 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -31,7 +31,9 @@ namespace android { namespace os { namespace statsd { -StatsLogProcessor::StatsLogProcessor() : m_dropbox_writer("all-logs") { +StatsLogProcessor::StatsLogProcessor(const sp<UidMap> &uidMap) + : m_dropbox_writer("all-logs"), m_UidMap(uidMap) +{ // hardcoded config // this should be called from StatsService when it receives a statsd_config UpdateConfig(0, buildFakeConfig()); diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h index ab1b44eb6875..05e441caa496 100644 --- a/cmds/statsd/src/StatsLogProcessor.h +++ b/cmds/statsd/src/StatsLogProcessor.h @@ -21,6 +21,7 @@ #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" #include "metrics/MetricsManager.h" #include "stats_util.h" +#include "UidMap.h" #include <log/logprint.h> #include <stdio.h> @@ -32,7 +33,7 @@ namespace statsd { class StatsLogProcessor : public LogListener { public: - StatsLogProcessor(); + StatsLogProcessor(const sp<UidMap> &uidMap); virtual ~StatsLogProcessor(); virtual void OnLogEvent(const log_msg& msg); @@ -44,6 +45,8 @@ private: DropboxWriter m_dropbox_writer; std::unordered_map<int, std::unique_ptr<MetricsManager>> mMetricsManagers; + + sp<UidMap> m_UidMap; // Reference to the UidMap to lookup app name and version for each uid. }; } // namespace statsd diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index 9baeebbd554f..b496404962d5 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -40,7 +40,8 @@ namespace os { namespace statsd { StatsService::StatsService(const sp<Looper>& handlerLooper) - : mAnomalyMonitor(new AnomalyMonitor(2)), mStatsPullerManager() // TODO: Change this based on the config + : mAnomalyMonitor(new AnomalyMonitor(2)),m_UidMap(new UidMap()), mStatsPullerManager() + // TODO: Change AnomalyMonitor initialization based on the config { ALOGD("stats service constructed"); } @@ -131,6 +132,9 @@ status_t StatsService::command(FILE* in, FILE* out, FILE* err, Vector<String8>& if (!args[0].compare(String8("config"))) { return doLoadConfig(in); } + if (!args[0].compare(String8("print-uid-map"))) { + return doPrintUidMap(out); + } } printCmdHelp(out); @@ -153,6 +157,43 @@ status_t StatsService::doLoadConfig(FILE* in) { } } +Status StatsService::informAllUidData(const vector<int32_t>& uid, const vector<int32_t>& version, + const vector<String16>& app) { + if (DEBUG) ALOGD("StatsService::informAllUidData was called"); + + if (IPCThreadState::self()->getCallingUid() != AID_SYSTEM) { + return Status::fromExceptionCode(Status::EX_SECURITY, + "Only system uid can call informAllUidData"); + } + + m_UidMap->updateMap(uid, version, app); + if (DEBUG) ALOGD("StatsService::informAllUidData succeeded"); + + return Status::ok(); +} + +Status StatsService::informOnePackage(const String16& app, int32_t uid, int32_t version) { + if (DEBUG) ALOGD("StatsService::informOnePackage was called"); + + if (IPCThreadState::self()->getCallingUid() != AID_SYSTEM) { + return Status::fromExceptionCode(Status::EX_SECURITY, + "Only system uid can call informOnePackage"); + } + m_UidMap->updateApp(app, uid, version); + return Status::ok(); +} + +Status StatsService::informOnePackageRemoved(const String16& app, int32_t uid) { + if (DEBUG) ALOGD("StatsService::informOnePackageRemoved was called"); + + if (IPCThreadState::self()->getCallingUid() != AID_SYSTEM) { + return Status::fromExceptionCode(Status::EX_SECURITY, + "Only system uid can call informOnePackageRemoved"); + } + m_UidMap->removeApp(app, uid); + return Status::ok(); +} + Status StatsService::informAnomalyAlarmFired() { if (DEBUG) ALOGD("StatsService::informAnomalyAlarmFired was called"); @@ -261,9 +302,15 @@ status_t StatsService::doPrintStatsLog(FILE* out, const Vector<String8>& args) { return DropboxReader::readStatsLogs(out, args[1].string(), msec); } +status_t StatsService::doPrintUidMap(FILE* out) { + m_UidMap->printUidMap(out); + return NO_ERROR; +} + void StatsService::printCmdHelp(FILE* out) { fprintf(out, "Usage:\n"); fprintf(out, "\t print-stats-log [tag_required] [timestamp_nsec_optional]\n"); + fprintf(out, "\t print-uid-map Prints the UID, app name, version mapping.\n"); fprintf(out, "\t config\t Loads a new config from command-line (must be proto in wire-encoded " "format).\n"); diff --git a/cmds/statsd/src/StatsService.h b/cmds/statsd/src/StatsService.h index 964227975fe8..541f7e8be7fa 100644 --- a/cmds/statsd/src/StatsService.h +++ b/cmds/statsd/src/StatsService.h @@ -20,6 +20,8 @@ #include "AnomalyMonitor.h" #include "StatsLogProcessor.h" #include "StatsPullerManager.h" +#include "StatsPuller.h" +#include "UidMap.h" #include <android/os/BnStatsManager.h> #include <android/os/IStatsCompanionService.h> @@ -60,6 +62,11 @@ public: virtual Status informPollAlarmFired(); + virtual Status informAllUidData(const vector<int32_t>& uid, const vector<int32_t>& version, + const vector<String16>& app); + virtual Status informOnePackage(const String16& app, int32_t uid, int32_t version); + virtual Status informOnePackageRemoved(const String16& app, int32_t uid); + virtual status_t setProcessor(const sp<StatsLogProcessor>& main_processor); // TODO: public for testing since statsd doesn't run when system starts. Change to private @@ -71,10 +78,16 @@ public: // TODO: Should be private. Temporarily public for testing purposes only. const sp<AnomalyMonitor> mAnomalyMonitor; + sp<UidMap> getUidMap() { + return m_UidMap; + } + /** Fetches and returns the StatsCompanionService. */ static sp<IStatsCompanionService> getStatsCompanionService(); private: + sp<UidMap> m_UidMap; // Reference to the UID map needed for translating UID to app name/version. + sp<StatsLogProcessor> m_processor; // Reference to the processor for updating configs. status_t doPrintStatsLog(FILE* out, const Vector<String8>& args); @@ -84,6 +97,8 @@ private: status_t doLoadConfig(FILE* in); StatsPullerManager mStatsPullerManager; + + status_t doPrintUidMap(FILE* out); }; // --- StatsdDeathRecipient --- diff --git a/cmds/statsd/src/UidMap.cpp b/cmds/statsd/src/UidMap.cpp new file mode 100644 index 000000000000..76a7f3f28dee --- /dev/null +++ b/cmds/statsd/src/UidMap.cpp @@ -0,0 +1,164 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, versionCode 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "UidMap.h" +#include <cutils/log.h> +#include <utils/Errors.h> + +using namespace android; + +namespace android { +namespace os { +namespace statsd { + +bool UidMap::hasApp(int uid, const string& packageName) const { + lock_guard<mutex> lock(mMutex); + + auto range = mMap.equal_range(uid); + for (auto it = range.first; it != range.second; ++it) { + if (it->second.packageName == packageName) { + return true; + } + } + return false; +} + +int UidMap::getAppVersion(int uid, const string& packageName) const { + lock_guard<mutex> lock(mMutex); + + auto range = mMap.equal_range(uid); + for (auto it = range.first; it != range.second; ++it) { + if (it->second.packageName == packageName) { + return it->second.versionCode; + } + } + return 0; +} + +void UidMap::updateMap(const vector <int32_t> &uid, const vector <int32_t> &versionCode, + const vector <String16> &packageName) { + lock_guard<mutex> lock(mMutex); // Exclusively lock for updates. + + mMap.clear(); + for (unsigned long j=0; j<uid.size(); j++) { + mMap.insert(make_pair(uid[j], AppData(string(String8(packageName[j]).string()), + versionCode[j]))); + } + + if (mOutput.initial_size() == 0) { // Provide the initial states in the mOutput proto + for (unsigned long j=0; j<uid.size(); j++) { + auto t = mOutput.add_initial(); + t->set_app(string(String8(packageName[j]).string())); + t->set_version(int(versionCode[j])); + t->set_uid(uid[j]); + } + } +} + +void UidMap::updateApp(const String16& app_16, const int32_t& uid, const int32_t& versionCode){ + lock_guard<mutex> lock(mMutex); + + string app = string(String8(app_16).string()); + + // Notify any interested producers that this app has updated + for (auto it : mSubscribers) { + it->notifyAppUpgrade(app, uid, versionCode); + } + + auto log = mOutput.add_changes(); + log->set_deletion(false); + //log.timestamp = TODO: choose how timestamps are computed + log->set_app(app); + log->set_uid(uid); + log->set_version(versionCode); + + auto range = mMap.equal_range(int(uid)); + for (auto it = range.first; it != range.second; ++it) { + if (it->second.packageName == app) { + it->second.versionCode = int(versionCode); + return; + } + ALOGD("updateApp failed to find the app %s with uid %i to update", app.c_str(), uid); + return; + } + + // Otherwise, we need to add an app at this uid. + mMap.insert(make_pair(uid, AppData(app, int(versionCode)))); +} + + +void UidMap::removeApp(const String16& app_16, const int32_t& uid){ + lock_guard<mutex> lock(mMutex); + + string app = string(String8(app_16).string()); + + auto log = mOutput.add_changes(); + log->set_deletion(true); + //log.timestamp = TODO: choose how timestamps are computed + log->set_app(app); + log->set_uid(uid); + + auto range = mMap.equal_range(int(uid)); + for (auto it = range.first; it != range.second; ++it) { + if (it->second.packageName == app) { + mMap.erase(it); + return; + } + } + ALOGD("removeApp failed to find the app %s with uid %i to remove", app.c_str(), uid); + return; +} + +void UidMap::addListener(sp<PackageInfoListener> producer) { + lock_guard<mutex> lock(mMutex); // Lock for updates + mSubscribers.insert(producer); +} + +void UidMap::removeListener(sp<PackageInfoListener> producer) { + lock_guard<mutex> lock(mMutex); // Lock for updates + mSubscribers.erase(producer); +} + +UidMapping UidMap::getAndClearOutput() { + lock_guard<mutex> lock(mMutex); // Lock for updates + + auto ret = UidMapping(mOutput); // Copy that will be returned. + mOutput.Clear(); + + // Re-initialize the initial state for the outputs. This results in extra data being uploaded + // but helps ensure we can't re-construct the UID->app name, versionCode mapping in server. + for (auto it : mMap) { + auto t = mOutput.add_initial(); + t->set_app(it.second.packageName); + t->set_version(it.second.versionCode); + t->set_uid(it.first); + } + + return ret; +} + +void UidMap::printUidMap(FILE* out) { + lock_guard<mutex> lock(mMutex); + + for (auto it : mMap) { + fprintf(out, "%s, v%d (%i)\n", it.second.packageName.c_str(), it.second.versionCode, it.first); + } +} + + +} // namespace statsd +} // namespace os +} // namespace android diff --git a/cmds/statsd/src/UidMap.h b/cmds/statsd/src/UidMap.h new file mode 100644 index 000000000000..1481010a60b8 --- /dev/null +++ b/cmds/statsd/src/UidMap.h @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef STATSD_UIDMAP_H +#define STATSD_UIDMAP_H + +#include "frameworks/base/cmds/statsd/src/stats_log.pb.h" +#include "PackageInfoListener.h" + +#include <binder/IResultReceiver.h> +#include <binder/IShellCallback.h> +#include <log/logprint.h> +#include <mutex> +#include <string> +#include <stdio.h> +#include <set> +#include <unordered_map> +#include <utils/RefBase.h> + +using namespace std; + +namespace android { +namespace os { +namespace statsd { + +struct AppData { + const string packageName; + int versionCode; + + AppData(const string& a, const int v) : packageName(a), versionCode(v) {}; +}; + +// UidMap keeps track of what the corresponding app name (APK name) and version code for every uid +// at any given moment. This map must be updated by StatsCompanionService. +class UidMap : public virtual android::RefBase { +public: + /* + * All three inputs must be the same size, and the jth element in each array refers to the same + * tuple, ie. uid[j] corresponds to packageName[j] with versionCode[j]. + */ + void updateMap(const vector<int32_t>& uid, const vector<int32_t>& versionCode, + const vector<String16>& packageName); + + // Returns true if the given uid contains the specified app (eg. com.google.android.gms). + bool hasApp(int uid, const string& packageName) const; + + int getAppVersion(int uid, const string& packageName) const; + + void updateApp(const String16& packageName, const int32_t& uid, const int32_t& versionCode); + void removeApp(const String16& packageName, const int32_t& uid); + + // Helper for debugging contents of this uid map. Can be triggered with: + // adb shell cmd stats print-uid-map + void printUidMap(FILE* out); + + // Commands for indicating to the map that a producer should be notified if an app is updated. + // This allows the metric producer to distinguish when the same uid or app represents a + // different version of an app. + void addListener(sp<PackageInfoListener> producer); + // Remove the listener from the set of metric producers that subscribe to updates. + void removeListener(sp<PackageInfoListener> producer); + + // Grabs the current output contents and then clears it. + UidMapping getAndClearOutput(); + +private: + // TODO: Use shared_mutex for improved read-locking if a library can be found in Android. + mutable mutex mMutex; + + std::unordered_multimap<int, AppData> mMap; + + // We prepare the output proto as apps are updated, so that we can grab the current output. + UidMapping mOutput; + + // Metric producers that should be notified if there's an upgrade in any app. + set<sp<PackageInfoListener>> mSubscribers; +}; + +} // namespace statsd +} // namespace os +} // namespace android + +#endif //STATSD_UIDMAP_H + diff --git a/cmds/statsd/src/condition/SimpleConditionTracker.cpp b/cmds/statsd/src/condition/SimpleConditionTracker.cpp index 14ec72ef8aab..e78c0de7bdf5 100644 --- a/cmds/statsd/src/condition/SimpleConditionTracker.cpp +++ b/cmds/statsd/src/condition/SimpleConditionTracker.cpp @@ -58,7 +58,7 @@ SimpleConditionTracker::SimpleConditionTracker( return; } mStopLogMatcherIndex = pair->second; - mTrackerIndex.insert(mStartLogMatcherIndex); + mTrackerIndex.insert(mStopLogMatcherIndex); } else { mStopLogMatcherIndex = -1; } diff --git a/cmds/statsd/src/indexed_priority_queue.h b/cmds/statsd/src/indexed_priority_queue.h index c749c3ee6d17..81e8b3d023ea 100644 --- a/cmds/statsd/src/indexed_priority_queue.h +++ b/cmds/statsd/src/indexed_priority_queue.h @@ -55,6 +55,8 @@ public: void push(sp<const AA> a); /** Removes a from the priority queue. If not present or a==nullptr, does nothing. */ void remove(sp<const AA> a); + /** Removes the top element, if there is one. */ + void pop(); /** Removes all elements. */ void clear(); /** Returns whether priority queue contains a (not just a copy of a, but a itself). */ @@ -127,6 +129,28 @@ void indexed_priority_queue<AA, Comparator>::remove(sp<const AA> a) { sift_down(idx); } +// The same as, but slightly more efficient than, remove(top()). +template <class AA, class Comparator> +void indexed_priority_queue<AA, Comparator>::pop() { + sp<const AA> a = top(); + if (a == nullptr) return; + const size_t idx = 1; + if (idx == size()) { // if a is the last element + pq.pop_back(); + indices.erase(a); + return; + } + // move last element (guaranteed not to be at idx) to idx, then delete a + sp<const AA> last_a = pq.back(); + pq[idx] = last_a; + pq.pop_back(); + indices[last_a] = idx; + indices.erase(a); + + // get the heap back in order (since the element at idx is not in order) + sift_down(idx); +} + template <class AA, class Comparator> void indexed_priority_queue<AA, Comparator>::clear() { pq.clear(); diff --git a/cmds/statsd/src/main.cpp b/cmds/statsd/src/main.cpp index b303321d8ef2..37477dc50e4e 100644 --- a/cmds/statsd/src/main.cpp +++ b/cmds/statsd/src/main.cpp @@ -20,6 +20,7 @@ #include "LogReader.h" #include "StatsLogProcessor.h" #include "StatsService.h" +#include "UidMap.h" #include <binder/IInterface.h> #include <binder/IPCThreadState.h> @@ -56,7 +57,7 @@ static void* log_reader_thread_func(void* cookie) { // Put the printer one first, so it will print before the real ones. reader->AddListener(new LogEntryPrinter(STDOUT_FILENO)); - sp<StatsLogProcessor> main_processor = new StatsLogProcessor(); + sp<StatsLogProcessor> main_processor = new StatsLogProcessor(data->service->getUidMap()); data->service->setProcessor(main_processor); reader->AddListener(main_processor); diff --git a/cmds/statsd/src/metrics/CountMetricProducer.h b/cmds/statsd/src/metrics/CountMetricProducer.h index 0729e2c45f58..370cd4684458 100644 --- a/cmds/statsd/src/metrics/CountMetricProducer.h +++ b/cmds/statsd/src/metrics/CountMetricProducer.h @@ -26,6 +26,8 @@ #include "frameworks/base/cmds/statsd/src/stats_log.pb.h" #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" +using namespace std; + namespace android { namespace os { namespace statsd { @@ -44,6 +46,9 @@ public: void onDumpReport() override; + // TODO: Implement this later. + virtual void notifyAppUpgrade(const string& apk, const int uid, const int version) override {}; + private: const CountMetric mMetric; diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h index 7d3d661ca433..b7e965610020 100644 --- a/cmds/statsd/src/metrics/MetricProducer.h +++ b/cmds/statsd/src/metrics/MetricProducer.h @@ -20,14 +20,17 @@ #include <log/logprint.h> #include <utils/RefBase.h> #include "../matchers/matcher_util.h" +#include "PackageInfoListener.h" namespace android { namespace os { namespace statsd { // A MetricProducer is responsible for compute one single metrics, creating stats log report, and -// writing the report to dropbox. -class MetricProducer : public virtual RefBase { +// writing the report to dropbox. MetricProducers should respond to package changes as required in +// PackageInfoListener, but if none of the metrics are slicing by package name, then the update can +// be a no-op. +class MetricProducer : public virtual RefBase, public virtual PackageInfoListener { public: virtual ~MetricProducer(){}; diff --git a/cmds/statsd/tests/AnomalyMonitor_test.cpp b/cmds/statsd/tests/AnomalyMonitor_test.cpp new file mode 100644 index 000000000000..d5b68118d119 --- /dev/null +++ b/cmds/statsd/tests/AnomalyMonitor_test.cpp @@ -0,0 +1,66 @@ +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#define LOG_TAG "statsd_test" + +#include "../src/AnomalyMonitor.h" + +#include <gtest/gtest.h> + +using namespace android::os::statsd; + +#ifdef __ANDROID__ +TEST(AnomalyMonitor, popSoonerThan) { + unordered_set<sp<const AnomalyAlarm>, SpHash<AnomalyAlarm>> set; + AnomalyMonitor am(2); + + set = am.popSoonerThan(5); + EXPECT_TRUE(set.empty()); + + sp<const AnomalyAlarm> a = new AnomalyAlarm{10}; + sp<const AnomalyAlarm> b = new AnomalyAlarm{20}; + sp<const AnomalyAlarm> c = new AnomalyAlarm{20}; + sp<const AnomalyAlarm> d = new AnomalyAlarm{30}; + sp<const AnomalyAlarm> e = new AnomalyAlarm{40}; + sp<const AnomalyAlarm> f = new AnomalyAlarm{50}; + + am.add(a); + am.add(b); + am.add(c); + am.add(d); + am.add(e); + am.add(f); + + set = am.popSoonerThan(5); + EXPECT_TRUE(set.empty()); + + set = am.popSoonerThan(30); + EXPECT_EQ(4u, set.size()); + EXPECT_EQ(1u, set.count(a)); + EXPECT_EQ(1u, set.count(b)); + EXPECT_EQ(1u, set.count(c)); + EXPECT_EQ(1u, set.count(d)); + + set = am.popSoonerThan(60); + EXPECT_EQ(2u, set.size()); + EXPECT_EQ(1u, set.count(e)); + EXPECT_EQ(1u, set.count(f)); + + set = am.popSoonerThan(80); + EXPECT_EQ(0u, set.size()); +} + +#else +GTEST_LOG_(INFO) << "This test does nothing.\n"; +#endif diff --git a/cmds/statsd/tests/UidMap_test.cpp b/cmds/statsd/tests/UidMap_test.cpp new file mode 100644 index 000000000000..b6f14493cb36 --- /dev/null +++ b/cmds/statsd/tests/UidMap_test.cpp @@ -0,0 +1,69 @@ +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#define LOG_TAG "statsd_test" + +#include <gtest/gtest.h> +#include "../src/UidMap.h" +#include <stdio.h> + +using namespace android; +using namespace android::os::statsd; + +#ifdef __ANDROID__ +const string kApp1 = "app1.sharing.1"; +const string kApp2 = "app2.sharing.1"; + +TEST(UidMapTest, TestMatching) { + UidMap m; + vector<int32_t> uids; + vector<int32_t> versions; + vector<String16> apps; + + uids.push_back(1000); + uids.push_back(1000); + apps.push_back(String16(kApp1.c_str())); + apps.push_back(String16(kApp2.c_str())); + versions.push_back(4); + versions.push_back(5); + m.updateMap(uids, versions, apps); + EXPECT_TRUE(m.hasApp(1000, kApp1)); + EXPECT_TRUE(m.hasApp(1000, kApp2)); + EXPECT_FALSE(m.hasApp(1000, "not.app")); +} + +TEST(UidMapTest, TestAddAndRemove) { + UidMap m; + vector<int32_t> uids; + vector<int32_t> versions; + vector<String16> apps; + + uids.push_back(1000); + uids.push_back(1000); + apps.push_back(String16(kApp1.c_str())); + apps.push_back(String16(kApp2.c_str())); + versions.push_back(4); + versions.push_back(5); + m.updateMap(uids, versions, apps); + + m.updateApp(String16(kApp1.c_str()), 1000, 40); + EXPECT_EQ(40, m.getAppVersion(1000, kApp1)); + + m.removeApp(String16(kApp1.c_str()), 1000); + EXPECT_FALSE(m.hasApp(1000, kApp1)); + EXPECT_TRUE(m.hasApp(1000, kApp2)); +} +#else +GTEST_LOG_(INFO) << "This test does nothing.\n"; +#endif
\ No newline at end of file diff --git a/cmds/statsd/tests/indexed_priority_queue_test.cpp b/cmds/statsd/tests/indexed_priority_queue_test.cpp index e4d4d25afe00..74a482eace58 100644 --- a/cmds/statsd/tests/indexed_priority_queue_test.cpp +++ b/cmds/statsd/tests/indexed_priority_queue_test.cpp @@ -182,6 +182,40 @@ TEST(indexed_priority_queue, nulls) { EXPECT_FALSE(ipq.contains(nullptr)); } +TEST(indexed_priority_queue, pop) { + indexed_priority_queue<AATest, AATest::Smaller> ipq; + sp<const AATest> a = new AATest{1}; + sp<const AATest> b = new AATest{2}; + sp<const AATest> c = new AATest{3}; + + ipq.push(c); + ipq.push(b); + ipq.push(a); + EXPECT_EQ(3u, ipq.size()); + + ipq.pop(); + EXPECT_EQ(2u, ipq.size()); + EXPECT_FALSE(ipq.contains(a)); + EXPECT_TRUE(ipq.contains(b)); + EXPECT_TRUE(ipq.contains(c)); + + ipq.pop(); + EXPECT_EQ(1u, ipq.size()); + EXPECT_FALSE(ipq.contains(a)); + EXPECT_FALSE(ipq.contains(b)); + EXPECT_TRUE(ipq.contains(c)); + + ipq.pop(); + EXPECT_EQ(0u, ipq.size()); + EXPECT_FALSE(ipq.contains(a)); + EXPECT_FALSE(ipq.contains(b)); + EXPECT_FALSE(ipq.contains(c)); + EXPECT_TRUE(ipq.empty()); + + ipq.pop(); // pop an empty queue + EXPECT_TRUE(ipq.empty()); +} + #else GTEST_LOG_(INFO) << "This test does nothing.\n"; #endif diff --git a/core/java/android/app/NotificationChannel.java b/core/java/android/app/NotificationChannel.java index 47063f0842e8..c06ad3f32cf4 100644 --- a/core/java/android/app/NotificationChannel.java +++ b/core/java/android/app/NotificationChannel.java @@ -32,6 +32,8 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.util.Preconditions; +import com.android.internal.util.Preconditions; + import org.json.JSONException; import org.json.JSONObject; import org.xmlpull.v1.XmlPullParser; diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 8987bc0289b7..23c4166da104 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -73,15 +73,16 @@ public class StatusBarManager { public static final int DISABLE2_QUICK_SETTINGS = 1; public static final int DISABLE2_SYSTEM_ICONS = 1 << 1; public static final int DISABLE2_NOTIFICATION_SHADE = 1 << 2; + public static final int DISABLE2_GLOBAL_ACTIONS = 1 << 3; public static final int DISABLE2_NONE = 0x00000000; public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS - | DISABLE2_NOTIFICATION_SHADE; + | DISABLE2_NOTIFICATION_SHADE | DISABLE2_GLOBAL_ACTIONS; @IntDef(flag = true, value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS, DISABLE2_SYSTEM_ICONS, - DISABLE2_NOTIFICATION_SHADE}) + DISABLE2_NOTIFICATION_SHADE, DISABLE2_GLOBAL_ACTIONS}) @Retention(RetentionPolicy.SOURCE) public @interface Disable2Flags {} diff --git a/core/java/android/app/job/JobScheduler.java b/core/java/android/app/job/JobScheduler.java index 3868439f092f..0deb2e13dce0 100644 --- a/core/java/android/app/job/JobScheduler.java +++ b/core/java/android/app/job/JobScheduler.java @@ -24,7 +24,6 @@ import android.annotation.SystemApi; import android.annotation.SystemService; import android.content.ClipData; import android.content.Context; -import android.content.Intent; import android.os.Bundle; import android.os.PersistableBundle; @@ -40,16 +39,18 @@ import java.util.List; * and how to construct them. You will construct these JobInfo objects and pass them to the * JobScheduler with {@link #schedule(JobInfo)}. When the criteria declared are met, the * system will execute this job on your application's {@link android.app.job.JobService}. - * You identify which JobService is meant to execute the logic for your job when you create the - * JobInfo with + * You identify the service component that implements the logic for your job when you + * construct the JobInfo using * {@link android.app.job.JobInfo.Builder#JobInfo.Builder(int,android.content.ComponentName)}. * </p> * <p> - * The framework will be intelligent about when you receive your callbacks, and attempt to batch - * and defer them as much as possible. Typically if you don't specify a deadline on your job, it - * can be run at any moment depending on the current state of the JobScheduler's internal queue, - * however it might be deferred as long as until the next time the device is connected to a power - * source. + * The framework will be intelligent about when it executes jobs, and attempt to batch + * and defer them as much as possible. Typically if you don't specify a deadline on a job, it + * can be run at any moment depending on the current state of the JobScheduler's internal queue. + * <p> + * While a job is running, the system holds a wakelock on behalf of your app. For this reason, + * you do not need to take any action to guarantee that the device stays awake for the + * duration of the job. * </p> * <p>You do not * instantiate this class directly; instead, retrieve it through @@ -141,30 +142,34 @@ public abstract class JobScheduler { int userId, String tag); /** - * Cancel a job that is pending in the JobScheduler. - * @param jobId unique identifier for this job. Obtain this value from the jobs returned by - * {@link #getAllPendingJobs()}. + * Cancel the specified job. If the job is currently executing, it is stopped + * immediately and the return value from its {@link JobService#onStopJob(JobParameters)} + * method is ignored. + * + * @param jobId unique identifier for the job to be canceled, as supplied to + * {@link JobInfo.Builder#JobInfo.Builder(int, android.content.ComponentName) + * JobInfo.Builder(int, android.content.ComponentName)}. */ public abstract void cancel(int jobId); /** - * Cancel all jobs that have been registered with the JobScheduler by this package. + * Cancel <em>all</em> jobs that have been scheduled by the calling application. */ public abstract void cancelAll(); /** - * Retrieve all jobs for this package that are pending in the JobScheduler. + * Retrieve all jobs that have been scheduled by the calling application. * - * @return a list of all the jobs registered by this package that have not - * yet been executed. + * @return a list of all of the app's scheduled jobs. This includes jobs that are + * currently started as well as those that are still waiting to run. */ public abstract @NonNull List<JobInfo> getAllPendingJobs(); /** - * Retrieve a specific job for this package that is pending in the - * JobScheduler. + * Look up the description of a scheduled job. * - * @return job registered by this package that has not yet been executed. + * @return The {@link JobInfo} description of the given scheduled job, or {@code null} + * if the supplied job ID does not correspond to any job. */ public abstract @Nullable JobInfo getPendingJob(int jobId); } diff --git a/core/java/android/app/job/JobService.java b/core/java/android/app/job/JobService.java index 9096b47b8d4d..69afed205de1 100644 --- a/core/java/android/app/job/JobService.java +++ b/core/java/android/app/job/JobService.java @@ -18,16 +18,7 @@ package android.app.job; import android.app.Service; import android.content.Intent; -import android.os.Handler; import android.os.IBinder; -import android.os.Looper; -import android.os.Message; -import android.os.RemoteException; -import android.util.Log; - -import com.android.internal.annotations.GuardedBy; - -import java.lang.ref.WeakReference; /** * <p>Entry point for the callback from the {@link android.app.job.JobScheduler}.</p> @@ -55,7 +46,7 @@ public abstract class JobService extends Service { * </pre> * * <p>If a job service is declared in the manifest but not protected with this - * permission, that service will be ignored by the OS. + * permission, that service will be ignored by the system. */ public static final String PERMISSION_BIND = "android.permission.BIND_JOB_SERVICE"; @@ -81,14 +72,36 @@ public abstract class JobService extends Service { } /** - * Override this method with the callback logic for your job. Any such logic needs to be - * performed on a separate thread, as this function is executed on your application's main - * thread. + * Called to indicate that the job has begun executing. Override this method with the + * logic for your job. Like all other component lifecycle callbacks, this method executes + * on your application's main thread. + * <p> + * Return {@code true} from this method if your job needs to continue running. If you + * do this, the job remains active until you call + * {@link #jobFinished(JobParameters, boolean)} to tell the system that it has completed + * its work, or until the job's required constraints are no longer satisfied. For + * example, if the job was scheduled using + * {@link JobInfo.Builder#setRequiresCharging(boolean) setRequiresCharging(true)}, + * it will be immediately halted by the system if the user unplugs the device from power, + * the job's {@link #onStopJob(JobParameters)} callback will be invoked, and the app + * will be expected to shut down all ongoing work connected with that job. + * <p> + * The system holds a wakelock on behalf of your app as long as your job is executing. + * This wakelock is acquired before this method is invoked, and is not released until either + * you call {@link #jobFinished(JobParameters, boolean)}, or after the system invokes + * {@link #onStopJob(JobParameters)} to notify your job that it is being shut down + * prematurely. + * <p> + * Returning {@code false} from this method means your job is already finished. The + * system's wakelock for the job will be released, and {@link #onStopJob(JobParameters)} + * will not be invoked. * - * @param params Parameters specifying info about this job, including the extras bundle you - * optionally provided at job-creation time. - * @return True if your service needs to process the work (on a separate thread). False if - * there's no more work to be done for this job. + * @param params Parameters specifying info about this job, including the optional + * extras configured with {@link JobInfo.Builder#setExtras(android.os.PersistableBundle). + * This object serves to identify this specific running job instance when calling + * {@link #jobFinished(JobParameters, boolean)}. + * @return {@code true} if your service will continue running, using a separate thread + * when appropriate. {@code false} means that this job has completed its work. */ public abstract boolean onStartJob(JobParameters params); @@ -101,37 +114,44 @@ public abstract class JobService extends Service { * {@link android.app.job.JobInfo.Builder#setRequiredNetworkType(int)}, yet while your * job was executing the user toggled WiFi. Another example is if you had specified * {@link android.app.job.JobInfo.Builder#setRequiresDeviceIdle(boolean)}, and the phone left its - * idle maintenance window. You are solely responsible for the behaviour of your application - * upon receipt of this message; your app will likely start to misbehave if you ignore it. One - * immediate repercussion is that the system will cease holding a wakelock for you.</p> + * idle maintenance window. You are solely responsible for the behavior of your application + * upon receipt of this message; your app will likely start to misbehave if you ignore it. + * <p> + * Once this method returns, the system releases the wakelock that it is holding on + * behalf of the job.</p> * - * @param params Parameters specifying info about this job. - * @return True to indicate to the JobManager whether you'd like to reschedule this job based - * on the retry criteria provided at job creation-time. False to drop the job. Regardless of - * the value returned, your job must stop executing. + * @param params The parameters identifying this job, as supplied to + * the job in the {@link #onStartJob(JobParameters)} callback. + * @return {@code true} to indicate to the JobManager whether you'd like to reschedule + * this job based on the retry criteria provided at job creation-time; or {@code false} + * to end the job entirely. Regardless of the value returned, your job must stop executing. */ public abstract boolean onStopJob(JobParameters params); /** - * Call this to inform the JobManager you've finished executing. This can be called from any - * thread, as it will ultimately be run on your application's main thread. When the system - * receives this message it will release the wakelock being held. + * Call this to inform the JobScheduler that the job has finished its work. When the + * system receives this message, it releases the wakelock being held for the job. * <p> - * You can specify post-execution behaviour to the scheduler here with - * <code>needsReschedule </code>. This will apply a back-off timer to your job based on - * the default, or what was set with - * {@link android.app.job.JobInfo.Builder#setBackoffCriteria(long, int)}. The original - * requirements are always honoured even for a backed-off job. Note that a job running in - * idle mode will not be backed-off. Instead what will happen is the job will be re-added - * to the queue and re-executed within a future idle maintenance window. + * You can request that the job be scheduled again by passing {@code true} as + * the <code>wantsReschedule</code> parameter. This will apply back-off policy + * for the job; this policy can be adjusted through the + * {@link android.app.job.JobInfo.Builder#setBackoffCriteria(long, int)} method + * when the job is originally scheduled. The job's initial + * requirements are preserved when jobs are rescheduled, regardless of backed-off + * policy. + * <p class="note"> + * A job running while the device is dozing will not be rescheduled with the normal back-off + * policy. Instead, the job will be re-added to the queue and executed again during + * a future idle maintenance window. * </p> * - * @param params Parameters specifying system-provided info about this job, this was given to - * your application in {@link #onStartJob(JobParameters)}. - * @param needsReschedule True if this job should be rescheduled according to the back-off - * criteria specified at schedule-time. False otherwise. + * @param params The parameters identifying this job, as supplied to + * the job in the {@link #onStartJob(JobParameters)} callback. + * @param wantsReschedule {@code true} if this job should be rescheduled according + * to the back-off criteria specified when it was first scheduled; {@code false} + * otherwise. */ - public final void jobFinished(JobParameters params, boolean needsReschedule) { - mEngine.jobFinished(params, needsReschedule); + public final void jobFinished(JobParameters params, boolean wantsReschedule) { + mEngine.jobFinished(params, wantsReschedule); } -}
\ No newline at end of file +} diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index ec48ac5e40dc..ad36139a2da4 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3711,17 +3711,15 @@ public class PackageParser { ai.flags |= ApplicationInfo.FLAG_IS_GAME; } - if (false) { - if (sa.getBoolean( - com.android.internal.R.styleable.AndroidManifestApplication_cantSaveState, - false)) { - ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE; + if (sa.getBoolean( + com.android.internal.R.styleable.AndroidManifestApplication_cantSaveState, + false)) { + ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE; - // A heavy-weight application can not be in a custom process. - // We can do direct compare because we intern all strings. - if (ai.processName != null && ai.processName != ai.packageName) { - outError[0] = "cantSaveState applications can not use custom processes"; - } + // A heavy-weight application can not be in a custom process. + // We can do direct compare because we intern all strings. + if (ai.processName != null && !ai.processName.equals(ai.packageName)) { + outError[0] = "cantSaveState applications can not use custom processes"; } } } diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index a8b8c4b5cd43..386239cf4f93 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -796,7 +796,7 @@ public class ResourcesImpl { dr = Drawable.createFromResourceStream(wrapper, value, is, file, null); is.close(); } - } catch (Exception e) { + } catch (Exception | StackOverflowError e) { Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); final NotFoundException rnf = new NotFoundException( "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id)); diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 988192797f59..450ced4b9897 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1911,6 +1911,13 @@ public abstract class BatteryStats implements Parcelable { long elapsedRealtimeUs, int which); /** + * Returns the {@link Timer} object that tracks the given screen brightness. + * + * {@hide} + */ + public abstract Timer getScreenBrightnessTimer(int brightnessBin); + + /** * Returns the time in microseconds that power save mode has been enabled while the device was * running on battery. * @@ -2019,6 +2026,14 @@ public abstract class BatteryStats implements Parcelable { long elapsedRealtimeUs, int which); /** + * Returns the {@link Timer} object that tracks how much the phone has been trying to + * acquire a signal. + * + * {@hide} + */ + public abstract Timer getPhoneSignalScanningTimer(); + + /** * Returns the number of times the phone has entered the given signal strength. * * {@hide} @@ -2026,6 +2041,12 @@ public abstract class BatteryStats implements Parcelable { public abstract int getPhoneSignalStrengthCount(int strengthBin, int which); /** + * Return the {@link Timer} object used to track the given signal strength's duration and + * counts. + */ + protected abstract Timer getPhoneSignalStrengthTimer(int strengthBin); + + /** * Returns the time in microseconds that the mobile network has been active * (in a high power state). * @@ -2108,6 +2129,11 @@ public abstract class BatteryStats implements Parcelable { */ public abstract int getPhoneDataConnectionCount(int dataType, int which); + /** + * Returns the {@link Timer} object that tracks the phone's data connection type stats. + */ + public abstract Timer getPhoneDataConnectionTimer(int dataType); + public static final int WIFI_SUPPL_STATE_INVALID = 0; public static final int WIFI_SUPPL_STATE_DISCONNECTED = 1; public static final int WIFI_SUPPL_STATE_INTERFACE_DISABLED = 2; @@ -2267,6 +2293,13 @@ public abstract class BatteryStats implements Parcelable { public abstract int getWifiStateCount(int wifiState, int which); /** + * Returns the {@link Timer} object that tracks the given WiFi state. + * + * {@hide} + */ + public abstract Timer getWifiStateTimer(int wifiState); + + /** * Returns the time in microseconds that the wifi supplicant has been * in a given state. * @@ -2282,6 +2315,13 @@ public abstract class BatteryStats implements Parcelable { */ public abstract int getWifiSupplStateCount(int state, int which); + /** + * Returns the {@link Timer} object that tracks the given wifi supplicant state. + * + * {@hide} + */ + public abstract Timer getWifiSupplStateTimer(int state); + public static final int NUM_WIFI_SIGNAL_STRENGTH_BINS = 5; /** @@ -2301,6 +2341,13 @@ public abstract class BatteryStats implements Parcelable { public abstract int getWifiSignalStrengthCount(int strengthBin, int which); /** + * Returns the {@link Timer} object that tracks the given WIFI signal strength. + * + * {@hide} + */ + public abstract Timer getWifiSignalStrengthTimer(int strengthBin); + + /** * Returns the time in microseconds that the flashlight has been on while the device was * running on battery. * @@ -2487,13 +2534,13 @@ public abstract class BatteryStats implements Parcelable { public abstract int getDischargeAmountScreenOffSinceCharge(); /** - * Get the amount the battery has discharged while the screen was doze, + * Get the amount the battery has discharged while the screen was dozing, * since the last time power was unplugged. */ public abstract int getDischargeAmountScreenDoze(); /** - * Get the amount the battery has discharged while the screen was doze, + * Get the amount the battery has discharged while the screen was dozing, * since the last time the device was charged. */ public abstract int getDischargeAmountScreenDozeSinceCharge(); @@ -2626,20 +2673,20 @@ public abstract class BatteryStats implements Parcelable { * micro-Ampere-hours. This will be non-zero only if the device's battery has * a coulomb counter. */ - public abstract long getMahDischargeScreenOff(int which); + public abstract long getUahDischargeScreenOff(int which); /** * Return the amount of battery discharge while the screen was in doze mode, measured in * micro-Ampere-hours. This will be non-zero only if the device's battery has * a coulomb counter. */ - public abstract long getMahDischargeScreenDoze(int which); + public abstract long getUahDischargeScreenDoze(int which); /** * Return the amount of battery discharge measured in micro-Ampere-hours. This will be * non-zero only if the device's battery has a coulomb counter. */ - public abstract long getMahDischarge(int which); + public abstract long getUahDischarge(int which); /** * Returns the estimated real battery capacity, which may be less than the capacity @@ -2984,7 +3031,7 @@ public abstract class BatteryStats implements Parcelable { final long totalTime = (timer.getTotalTimeLocked(rawRealtime, which) + 500) / 1000; final int count = timer.getCountLocked(which); - if (totalTime != 0) { + if (totalTime != 0 || count != 0) { dumpLine(pw, uid, category, type, totalTime, count); } } @@ -3000,12 +3047,12 @@ public abstract class BatteryStats implements Parcelable { * @param which one of STATS_SINCE_CHARGED, STATS_SINCE_UNPLUGGED, or STATS_CURRENT */ private static void dumpTimer(ProtoOutputStream proto, long fieldId, - Timer timer, long rawRealtime, int which) { + Timer timer, long rawRealtimeUs, int which) { if (timer == null) { return; } // Convert from microseconds to milliseconds with rounding - final long totalTimeMs = (timer.getTotalTimeLocked(rawRealtime, which) + 500) / 1000; + final long totalTimeMs = (timer.getTotalTimeLocked(rawRealtimeUs, which) + 500) / 1000; final int count = timer.getCountLocked(which); if (totalTimeMs != 0 || count != 0) { final long token = proto.start(fieldId); @@ -3191,13 +3238,13 @@ public abstract class BatteryStats implements Parcelable { /** * Checkin server version of dump to produce more compact, computer-readable log. * - * NOTE: all times are expressed in 'ms'. + * NOTE: all times are expressed in microseconds, unless specified otherwise. */ public final void dumpCheckinLocked(Context context, PrintWriter pw, int which, int reqUid, boolean wifiOnly) { final long rawUptime = SystemClock.uptimeMillis() * 1000; - final long rawRealtime = SystemClock.elapsedRealtime() * 1000; - final long rawRealtimeMs = (rawRealtime + 500) / 1000; + final long rawRealtimeMs = SystemClock.elapsedRealtime(); + final long rawRealtime = rawRealtimeMs * 1000; final long batteryUptime = getBatteryUptime(rawUptime); final long whichBatteryUptime = computeBatteryUptime(rawUptime, which); final long whichBatteryRealtime = computeBatteryRealtime(rawRealtime, which); @@ -3220,9 +3267,9 @@ public abstract class BatteryStats implements Parcelable { rawRealtime, which); final int connChanges = getNumConnectivityChange(which); final long phoneOnTime = getPhoneOnTime(rawRealtime, which); - final long dischargeCount = getMahDischarge(which); - final long dischargeScreenOffCount = getMahDischargeScreenOff(which); - final long dischargeScreenDozeCount = getMahDischargeScreenDoze(which); + final long dischargeCount = getUahDischarge(which); + final long dischargeScreenOffCount = getUahDischargeScreenOff(which); + final long dischargeScreenDozeCount = getUahDischargeScreenDoze(which); final StringBuilder sb = new StringBuilder(128); @@ -3460,9 +3507,9 @@ public abstract class BatteryStats implements Parcelable { BatteryStatsHelper.makemAh(helper.getComputedPower()), BatteryStatsHelper.makemAh(helper.getMinDrainedPower()), BatteryStatsHelper.makemAh(helper.getMaxDrainedPower())); + int uid = 0; for (int i=0; i<sippers.size(); i++) { final BatterySipper bs = sippers.get(i); - int uid = 0; String label; switch (bs.drainType) { case IDLE: @@ -3503,6 +3550,9 @@ public abstract class BatteryStats implements Parcelable { case CAMERA: label = "camera"; break; + case MEMORY: + label = "memory"; + break; default: label = "???"; } @@ -3523,6 +3573,7 @@ public abstract class BatteryStats implements Parcelable { dumpLine(pw, 0 /* uid */, category, GLOBAL_CPU_FREQ_DATA, sb.toString()); } + // Dump stats per UID. for (int iu = 0; iu < NU; iu++) { final int uid = uidStats.keyAt(iu); if (reqUid >= 0 && uid != reqUid) { @@ -4020,7 +4071,7 @@ public abstract class BatteryStats implements Parcelable { pw.println(sb.toString()); } - final long dischargeCount = getMahDischarge(which); + final long dischargeCount = getUahDischarge(which); if (dischargeCount >= 0) { sb.setLength(0); sb.append(prefix); @@ -4030,7 +4081,7 @@ public abstract class BatteryStats implements Parcelable { pw.println(sb.toString()); } - final long dischargeScreenOffCount = getMahDischargeScreenOff(which); + final long dischargeScreenOffCount = getUahDischargeScreenOff(which); if (dischargeScreenOffCount >= 0) { sb.setLength(0); sb.append(prefix); @@ -4040,7 +4091,7 @@ public abstract class BatteryStats implements Parcelable { pw.println(sb.toString()); } - final long dischargeScreenDozeCount = getMahDischargeScreenDoze(which); + final long dischargeScreenDozeCount = getUahDischargeScreenDoze(which); if (dischargeScreenDozeCount >= 0) { sb.setLength(0); sb.append(prefix); @@ -6038,6 +6089,61 @@ public abstract class BatteryStats implements Parcelable { return true; } + private static void dumpDurationSteps(ProtoOutputStream proto, long fieldId, + LevelStepTracker steps) { + if (steps == null) { + return; + } + int count = steps.mNumStepDurations; + long token; + for (int i = 0; i < count; ++i) { + token = proto.start(fieldId); + proto.write(SystemProto.BatteryLevelStep.DURATION_MS, steps.getDurationAt(i)); + proto.write(SystemProto.BatteryLevelStep.LEVEL, steps.getLevelAt(i)); + + final long initMode = steps.getInitModeAt(i); + final long modMode = steps.getModModeAt(i); + + int ds = SystemProto.BatteryLevelStep.DS_MIXED; + if ((modMode & STEP_LEVEL_MODE_SCREEN_STATE) == 0) { + switch ((int) (initMode & STEP_LEVEL_MODE_SCREEN_STATE) + 1) { + case Display.STATE_OFF: + ds = SystemProto.BatteryLevelStep.DS_OFF; + break; + case Display.STATE_ON: + ds = SystemProto.BatteryLevelStep.DS_ON; + break; + case Display.STATE_DOZE: + ds = SystemProto.BatteryLevelStep.DS_DOZE; + break; + case Display.STATE_DOZE_SUSPEND: + ds = SystemProto.BatteryLevelStep.DS_DOZE_SUSPEND; + break; + default: + ds = SystemProto.BatteryLevelStep.DS_ERROR; + break; + } + } + proto.write(SystemProto.BatteryLevelStep.DISPLAY_STATE, ds); + + int psm = SystemProto.BatteryLevelStep.PSM_MIXED; + if ((modMode & STEP_LEVEL_MODE_POWER_SAVE) == 0) { + psm = (initMode & STEP_LEVEL_MODE_POWER_SAVE) != 0 + ? SystemProto.BatteryLevelStep.PSM_ON : SystemProto.BatteryLevelStep.PSM_OFF; + } + proto.write(SystemProto.BatteryLevelStep.POWER_SAVE_MODE, psm); + + int im = SystemProto.BatteryLevelStep.IM_MIXED; + if ((modMode & STEP_LEVEL_MODE_DEVICE_IDLE) == 0) { + im = (initMode & STEP_LEVEL_MODE_DEVICE_IDLE) != 0 + ? SystemProto.BatteryLevelStep.IM_ON : SystemProto.BatteryLevelStep.IM_OFF; + } + proto.write(SystemProto.BatteryLevelStep.IDLE_MODE, im); + + proto.end(token); + } + } + public static final int DUMP_CHARGED_ONLY = 1<<1; public static final int DUMP_DAILY_ONLY = 1<<2; public static final int DUMP_HISTORY_ONLY = 1<<3; @@ -6463,7 +6569,7 @@ public abstract class BatteryStats implements Parcelable { } } - /** Dump batterystats data to a proto. @hide */ + /** Dump #STATS_SINCE_CHARGED batterystats data to a proto. @hide */ public void dumpProtoLocked(Context context, FileDescriptor fd, List<ApplicationInfo> apps, int flags, long historyStart) { final ProtoOutputStream proto = new ProtoOutputStream(fd); @@ -6485,10 +6591,376 @@ public abstract class BatteryStats implements Parcelable { if ((flags & (DUMP_HISTORY_ONLY | DUMP_DAILY_ONLY)) == 0) { // TODO: implement dumpProtoAppsLocked(proto, apps); - // TODO: implement dumpProtoSystemLocked(proto); + dumpProtoSystemLocked(context, proto, (flags & DUMP_DEVICE_WIFI_ONLY) != 0); } proto.end(bToken); proto.flush(); } + + private void dumpProtoSystemLocked(Context context, ProtoOutputStream proto, boolean wifiOnly) { + final long sToken = proto.start(BatteryStatsProto.SYSTEM); + final long rawUptimeUs = SystemClock.uptimeMillis() * 1000; + final long rawRealtimeMs = SystemClock.elapsedRealtime(); + final long rawRealtimeUs = rawRealtimeMs * 1000; + final int which = STATS_SINCE_CHARGED; + + // Battery data (BATTERY_DATA) + long token = proto.start(SystemProto.BATTERY); + proto.write(SystemProto.Battery.START_CLOCK_TIME_MS, getStartClockTime()); + proto.write(SystemProto.Battery.START_COUNT, getStartCount()); + proto.write(SystemProto.Battery.TOTAL_REALTIME_MS, + computeRealtime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Battery.TOTAL_UPTIME_MS, + computeUptime(rawUptimeUs, which) / 1000); + proto.write(SystemProto.Battery.BATTERY_REALTIME_MS, + computeBatteryRealtime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Battery.BATTERY_UPTIME_MS, + computeBatteryUptime(rawUptimeUs, which) / 1000); + proto.write(SystemProto.Battery.SCREEN_OFF_REALTIME_MS, + computeBatteryScreenOffRealtime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Battery.SCREEN_OFF_UPTIME_MS, + computeBatteryScreenOffUptime(rawUptimeUs, which) / 1000); + proto.write(SystemProto.Battery.SCREEN_DOZE_DURATION_MS, + getScreenDozeTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Battery.ESTIMATED_BATTERY_CAPACITY_MAH, + getEstimatedBatteryCapacity()); + proto.write(SystemProto.Battery.MIN_LEARNED_BATTERY_CAPACITY_UAH, + getMinLearnedBatteryCapacity()); + proto.write(SystemProto.Battery.MAX_LEARNED_BATTERY_CAPACITY_UAH, + getMaxLearnedBatteryCapacity()); + proto.end(token); + + // Battery discharge (BATTERY_DISCHARGE_DATA) + token = proto.start(SystemProto.BATTERY_DISCHARGE); + proto.write(SystemProto.BatteryDischarge.LOWER_BOUND_SINCE_CHARGE, + getLowDischargeAmountSinceCharge()); + proto.write(SystemProto.BatteryDischarge.UPPER_BOUND_SINCE_CHARGE, + getHighDischargeAmountSinceCharge()); + proto.write(SystemProto.BatteryDischarge.SCREEN_ON_SINCE_CHARGE, + getDischargeAmountScreenOnSinceCharge()); + proto.write(SystemProto.BatteryDischarge.SCREEN_OFF_SINCE_CHARGE, + getDischargeAmountScreenOffSinceCharge()); + proto.write(SystemProto.BatteryDischarge.SCREEN_DOZE_SINCE_CHARGE, + getDischargeAmountScreenDozeSinceCharge()); + proto.write(SystemProto.BatteryDischarge.TOTAL_MAH, + getUahDischarge(which) / 1000); + proto.write(SystemProto.BatteryDischarge.TOTAL_MAH_SCREEN_OFF, + getUahDischargeScreenOff(which) / 1000); + proto.write(SystemProto.BatteryDischarge.TOTAL_MAH_SCREEN_DOZE, + getUahDischargeScreenDoze(which) / 1000); + proto.end(token); + + // Time remaining + long timeRemainingUs = computeChargeTimeRemaining(rawRealtimeUs); + if (timeRemainingUs >= 0) { + // Charge time remaining (CHARGE_TIME_REMAIN_DATA) + proto.write(SystemProto.CHARGE_TIME_REMAINING_MS, timeRemainingUs / 1000); + } else { + timeRemainingUs = computeBatteryTimeRemaining(rawRealtimeUs); + // Discharge time remaining (DISCHARGE_TIME_REMAIN_DATA) + if (timeRemainingUs >= 0) { + proto.write(SystemProto.DISCHARGE_TIME_REMAINING_MS, timeRemainingUs / 1000); + } else { + proto.write(SystemProto.DISCHARGE_TIME_REMAINING_MS, -1); + } + } + + // Charge step (CHARGE_STEP_DATA) + dumpDurationSteps(proto, SystemProto.CHARGE_STEP, getChargeLevelStepTracker()); + + // Phone data connection (DATA_CONNECTION_TIME_DATA and DATA_CONNECTION_COUNT_DATA) + for (int i = 0; i < NUM_DATA_CONNECTION_TYPES; ++i) { + token = proto.start(SystemProto.DATA_CONNECTION); + proto.write(SystemProto.DataConnection.NAME, i); + dumpTimer(proto, SystemProto.DataConnection.TOTAL, getPhoneDataConnectionTimer(i), + rawRealtimeUs, which); + proto.end(token); + } + + // Discharge step (DISCHARGE_STEP_DATA) + dumpDurationSteps(proto, SystemProto.DISCHARGE_STEP, getDischargeLevelStepTracker()); + + // CPU frequencies (GLOBAL_CPU_FREQ_DATA) + final long[] cpuFreqs = getCpuFreqs(); + if (cpuFreqs != null) { + for (long i : cpuFreqs) { + proto.write(SystemProto.CPU_FREQUENCY, i); + } + } + + // Bluetooth controller (GLOBAL_BLUETOOTH_CONTROLLER_DATA) + dumpControllerActivityProto(proto, SystemProto.GLOBAL_BLUETOOTH_CONTROLLER, + getBluetoothControllerActivity(), which); + + // Modem controller (GLOBAL_MODEM_CONTROLLER_DATA) + dumpControllerActivityProto(proto, SystemProto.GLOBAL_MODEM_CONTROLLER, + getModemControllerActivity(), which); + + // Global network data (GLOBAL_NETWORK_DATA) + token = proto.start(SystemProto.GLOBAL_NETWORK); + proto.write(SystemProto.GlobalNetwork.MOBILE_BYTES_RX, + getNetworkActivityBytes(NETWORK_MOBILE_RX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.MOBILE_BYTES_TX, + getNetworkActivityBytes(NETWORK_MOBILE_TX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.MOBILE_PACKETS_RX, + getNetworkActivityPackets(NETWORK_MOBILE_RX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.MOBILE_PACKETS_TX, + getNetworkActivityPackets(NETWORK_MOBILE_TX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.WIFI_BYTES_RX, + getNetworkActivityBytes(NETWORK_WIFI_RX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.WIFI_BYTES_TX, + getNetworkActivityBytes(NETWORK_WIFI_TX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.WIFI_PACKETS_RX, + getNetworkActivityPackets(NETWORK_WIFI_RX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.WIFI_PACKETS_TX, + getNetworkActivityPackets(NETWORK_WIFI_TX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.BT_BYTES_RX, + getNetworkActivityBytes(NETWORK_BT_RX_DATA, which)); + proto.write(SystemProto.GlobalNetwork.BT_BYTES_TX, + getNetworkActivityBytes(NETWORK_BT_TX_DATA, which)); + proto.end(token); + + // Wifi controller (GLOBAL_WIFI_CONTROLLER_DATA) + dumpControllerActivityProto(proto, SystemProto.GLOBAL_WIFI_CONTROLLER, + getWifiControllerActivity(), which); + + + // Global wifi (GLOBAL_WIFI_DATA) + token = proto.start(SystemProto.GLOBAL_WIFI); + proto.write(SystemProto.GlobalWifi.ON_DURATION_MS, + getWifiOnTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.GlobalWifi.RUNNING_DURATION_MS, + getGlobalWifiRunningTime(rawRealtimeUs, which) / 1000); + proto.end(token); + + // Kernel wakelock (KERNEL_WAKELOCK_DATA) + final Map<String, ? extends Timer> kernelWakelocks = getKernelWakelockStats(); + for (Map.Entry<String, ? extends Timer> ent : kernelWakelocks.entrySet()) { + token = proto.start(SystemProto.KERNEL_WAKELOCK); + proto.write(SystemProto.KernelWakelock.NAME, ent.getKey()); + dumpTimer(proto, SystemProto.KernelWakelock.TOTAL, ent.getValue(), + rawRealtimeUs, which); + proto.end(token); + } + + // Misc (MISC_DATA) + // Calculate wakelock times across all uids. + long fullWakeLockTimeTotalUs = 0; + long partialWakeLockTimeTotalUs = 0; + + final SparseArray<? extends Uid> uidStats = getUidStats(); + for (int iu = 0; iu < uidStats.size(); iu++) { + final Uid u = uidStats.valueAt(iu); + + final ArrayMap<String, ? extends BatteryStats.Uid.Wakelock> wakelocks = + u.getWakelockStats(); + for (int iw = wakelocks.size() - 1; iw >= 0; --iw) { + final Uid.Wakelock wl = wakelocks.valueAt(iw); + + final Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL); + if (fullWakeTimer != null) { + fullWakeLockTimeTotalUs += fullWakeTimer.getTotalTimeLocked(rawRealtimeUs, + which); + } + + final Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL); + if (partialWakeTimer != null) { + partialWakeLockTimeTotalUs += partialWakeTimer.getTotalTimeLocked( + rawRealtimeUs, which); + } + } + } + token = proto.start(SystemProto.MISC); + proto.write(SystemProto.Misc.SCREEN_ON_DURATION_MS, + getScreenOnTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.PHONE_ON_DURATION_MS, + getPhoneOnTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.FULL_WAKELOCK_TOTAL_DURATION_MS, + fullWakeLockTimeTotalUs / 1000); + proto.write(SystemProto.Misc.PARTIAL_WAKELOCK_TOTAL_DURATION_MS, + partialWakeLockTimeTotalUs / 1000); + proto.write(SystemProto.Misc.MOBILE_RADIO_ACTIVE_DURATION_MS, + getMobileRadioActiveTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.MOBILE_RADIO_ACTIVE_ADJUSTED_TIME_MS, + getMobileRadioActiveAdjustedTime(which) / 1000); + proto.write(SystemProto.Misc.MOBILE_RADIO_ACTIVE_COUNT, + getMobileRadioActiveCount(which)); + proto.write(SystemProto.Misc.MOBILE_RADIO_ACTIVE_UNKNOWN_DURATION_MS, + getMobileRadioActiveUnknownTime(which) / 1000); + proto.write(SystemProto.Misc.INTERACTIVE_DURATION_MS, + getInteractiveTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.BATTERY_SAVER_MODE_ENABLED_DURATION_MS, + getPowerSaveModeEnabledTime(rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.NUM_CONNECTIVITY_CHANGES, + getNumConnectivityChange(which)); + proto.write(SystemProto.Misc.DEEP_DOZE_ENABLED_DURATION_MS, + getDeviceIdleModeTime(DEVICE_IDLE_MODE_DEEP, rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.DEEP_DOZE_COUNT, + getDeviceIdleModeCount(DEVICE_IDLE_MODE_DEEP, which)); + proto.write(SystemProto.Misc.DEEP_DOZE_IDLING_DURATION_MS, + getDeviceIdlingTime(DEVICE_IDLE_MODE_DEEP, rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.DEEP_DOZE_IDLING_COUNT, + getDeviceIdlingCount(DEVICE_IDLE_MODE_DEEP, which)); + proto.write(SystemProto.Misc.LONGEST_DEEP_DOZE_DURATION_MS, + getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_DEEP)); + proto.write(SystemProto.Misc.LIGHT_DOZE_ENABLED_DURATION_MS, + getDeviceIdleModeTime(DEVICE_IDLE_MODE_LIGHT, rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.LIGHT_DOZE_COUNT, + getDeviceIdleModeCount(DEVICE_IDLE_MODE_LIGHT, which)); + proto.write(SystemProto.Misc.LIGHT_DOZE_IDLING_DURATION_MS, + getDeviceIdlingTime(DEVICE_IDLE_MODE_LIGHT, rawRealtimeUs, which) / 1000); + proto.write(SystemProto.Misc.LIGHT_DOZE_IDLING_COUNT, + getDeviceIdlingCount(DEVICE_IDLE_MODE_LIGHT, which)); + proto.write(SystemProto.Misc.LONGEST_LIGHT_DOZE_DURATION_MS, + getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_LIGHT)); + proto.end(token); + + final BatteryStatsHelper helper = new BatteryStatsHelper(context, false, wifiOnly); + helper.create(this); + helper.refreshStats(which, UserHandle.USER_ALL); + + // Power use item (POWER_USE_ITEM_DATA) + final List<BatterySipper> sippers = helper.getUsageList(); + if (sippers != null) { + for (int i = 0; i < sippers.size(); ++i) { + final BatterySipper bs = sippers.get(i); + int n = SystemProto.PowerUseItem.UNKNOWN_SIPPER; + int uid = 0; + switch (bs.drainType) { + case IDLE: + n = SystemProto.PowerUseItem.IDLE; + break; + case CELL: + n = SystemProto.PowerUseItem.CELL; + break; + case PHONE: + n = SystemProto.PowerUseItem.PHONE; + break; + case WIFI: + n = SystemProto.PowerUseItem.WIFI; + break; + case BLUETOOTH: + n = SystemProto.PowerUseItem.BLUETOOTH; + break; + case SCREEN: + n = SystemProto.PowerUseItem.SCREEN; + break; + case FLASHLIGHT: + n = SystemProto.PowerUseItem.FLASHLIGHT; + break; + case APP: + // dumpProtoAppLocked will handle this. + continue; + case USER: + n = SystemProto.PowerUseItem.USER; + uid = UserHandle.getUid(bs.userId, 0); + break; + case UNACCOUNTED: + n = SystemProto.PowerUseItem.UNACCOUNTED; + break; + case OVERCOUNTED: + n = SystemProto.PowerUseItem.OVERCOUNTED; + break; + case CAMERA: + n = SystemProto.PowerUseItem.CAMERA; + break; + case MEMORY: + n = SystemProto.PowerUseItem.MEMORY; + break; + } + token = proto.start(SystemProto.POWER_USE_ITEM); + proto.write(SystemProto.PowerUseItem.NAME, n); + proto.write(SystemProto.PowerUseItem.UID, uid); + proto.write(SystemProto.PowerUseItem.COMPUTED_POWER_MAH, bs.totalPowerMah); + proto.write(SystemProto.PowerUseItem.SHOULD_HIDE, bs.shouldHide); + proto.write(SystemProto.PowerUseItem.SCREEN_POWER_MAH, bs.screenPowerMah); + proto.write(SystemProto.PowerUseItem.PROPORTIONAL_SMEAR_MAH, + bs.proportionalSmearMah); + proto.end(token); + } + } + + // Power use summary (POWER_USE_SUMMARY_DATA) + token = proto.start(SystemProto.POWER_USE_SUMMARY); + proto.write(SystemProto.PowerUseSummary.BATTERY_CAPACITY_MAH, + helper.getPowerProfile().getBatteryCapacity()); + proto.write(SystemProto.PowerUseSummary.COMPUTED_POWER_MAH, helper.getComputedPower()); + proto.write(SystemProto.PowerUseSummary.MIN_DRAINED_POWER_MAH, helper.getMinDrainedPower()); + proto.write(SystemProto.PowerUseSummary.MAX_DRAINED_POWER_MAH, helper.getMaxDrainedPower()); + proto.end(token); + + // RPM stats (RESOURCE_POWER_MANAGER_DATA) + final Map<String, ? extends Timer> rpmStats = getRpmStats(); + final Map<String, ? extends Timer> screenOffRpmStats = getScreenOffRpmStats(); + for (Map.Entry<String, ? extends Timer> ent : rpmStats.entrySet()) { + token = proto.start(SystemProto.RESOURCE_POWER_MANAGER); + proto.write(SystemProto.ResourcePowerManager.NAME, ent.getKey()); + dumpTimer(proto, SystemProto.ResourcePowerManager.TOTAL, + ent.getValue(), rawRealtimeUs, which); + dumpTimer(proto, SystemProto.ResourcePowerManager.SCREEN_OFF, + screenOffRpmStats.get(ent.getKey()), rawRealtimeUs, which); + proto.end(token); + } + + // Screen brightness (SCREEN_BRIGHTNESS_DATA) + for (int i = 0; i < NUM_SCREEN_BRIGHTNESS_BINS; ++i) { + token = proto.start(SystemProto.SCREEN_BRIGHTNESS); + proto.write(SystemProto.ScreenBrightness.NAME, i); + dumpTimer(proto, SystemProto.ScreenBrightness.TOTAL, getScreenBrightnessTimer(i), + rawRealtimeUs, which); + proto.end(token); + } + + // Signal scanning time (SIGNAL_SCANNING_TIME_DATA) + dumpTimer(proto, SystemProto.SIGNAL_SCANNING, getPhoneSignalScanningTimer(), rawRealtimeUs, + which); + + // Phone signal strength (SIGNAL_STRENGTH_TIME_DATA and SIGNAL_STRENGTH_COUNT_DATA) + for (int i = 0; i < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; ++i) { + token = proto.start(SystemProto.PHONE_SIGNAL_STRENGTH); + proto.write(SystemProto.PhoneSignalStrength.NAME, i); + dumpTimer(proto, SystemProto.PhoneSignalStrength.TOTAL, getPhoneSignalStrengthTimer(i), + rawRealtimeUs, which); + proto.end(token); + } + + // Wakeup reasons (WAKEUP_REASON_DATA) + final Map<String, ? extends Timer> wakeupReasons = getWakeupReasonStats(); + for (Map.Entry<String, ? extends Timer> ent : wakeupReasons.entrySet()) { + token = proto.start(SystemProto.WAKEUP_REASON); + proto.write(SystemProto.WakeupReason.NAME, ent.getKey()); + dumpTimer(proto, SystemProto.WakeupReason.TOTAL, ent.getValue(), rawRealtimeUs, which); + proto.end(token); + } + + // Wifi signal strength (WIFI_SIGNAL_STRENGTH_TIME_DATA and WIFI_SIGNAL_STRENGTH_COUNT_DATA) + for (int i = 0; i < NUM_WIFI_SIGNAL_STRENGTH_BINS; ++i) { + token = proto.start(SystemProto.WIFI_SIGNAL_STRENGTH); + proto.write(SystemProto.WifiSignalStrength.NAME, i); + dumpTimer(proto, SystemProto.WifiSignalStrength.TOTAL, getWifiSignalStrengthTimer(i), + rawRealtimeUs, which); + proto.end(token); + } + + // Wifi state (WIFI_STATE_TIME_DATA and WIFI_STATE_COUNT_DATA) + for (int i = 0; i < NUM_WIFI_STATES; ++i) { + token = proto.start(SystemProto.WIFI_STATE); + proto.write(SystemProto.WifiState.NAME, i); + dumpTimer(proto, SystemProto.WifiState.TOTAL, getWifiStateTimer(i), + rawRealtimeUs, which); + proto.end(token); + } + + // Wifi supplicant state (WIFI_SUPPL_STATE_TIME_DATA and WIFI_SUPPL_STATE_COUNT_DATA) + for (int i = 0; i < NUM_WIFI_SUPPL_STATES; ++i) { + token = proto.start(SystemProto.WIFI_SUPPLICANT_STATE); + proto.write(SystemProto.WifiSupplicantState.NAME, i); + dumpTimer(proto, SystemProto.WifiSupplicantState.TOTAL, getWifiSupplStateTimer(i), + rawRealtimeUs, which); + proto.end(token); + } + + proto.end(sToken); + } } diff --git a/core/java/android/os/IStatsManager.aidl b/core/java/android/os/IStatsManager.aidl index f8f28134063d..daacc4e832f9 100644 --- a/core/java/android/os/IStatsManager.aidl +++ b/core/java/android/os/IStatsManager.aidl @@ -45,4 +45,20 @@ interface IStatsManager { * Two-way binder call so that caller's method (and corresponding wakelocks) will linger. */ void informPollAlarmFired(); + + /** + * Inform statsd what the version and package are for each uid. Note that each array should + * have the same number of elements, and version[i] and package[i] correspond to uid[i]. + */ + oneway void informAllUidData(in int[] uid, in int[] version, in String[] app); + + /** + * Inform statsd what the uid and version are for one app that was updated. + */ + oneway void informOnePackage(in String app, in int uid, in int version); + + /** + * Inform stats that an app was removed. + */ + oneway void informOnePackageRemoved(in String app, in int uid); } diff --git a/core/java/android/text/DynamicLayout.java b/core/java/android/text/DynamicLayout.java index 24260c4f32c3..fba358cf4c1b 100644 --- a/core/java/android/text/DynamicLayout.java +++ b/core/java/android/text/DynamicLayout.java @@ -299,7 +299,7 @@ public class DynamicLayout extends Layout private final Paint.FontMetricsInt mFontMetricsInt = new Paint.FontMetricsInt(); - private static final SynchronizedPool<Builder> sPool = new SynchronizedPool<Builder>(3); + private static final SynchronizedPool<Builder> sPool = new SynchronizedPool<>(3); } /** @@ -440,7 +440,7 @@ public class DynamicLayout extends Layout mEllipsizeAt = null; } - mObjects = new PackedObjectVector<Directions>(1); + mObjects = new PackedObjectVector<>(1); // Initial state is a single line with 0 characters (0 to 0), with top at 0 and bottom at // whatever is natural, and undefined ellipsis. @@ -1050,7 +1050,7 @@ public class DynamicLayout extends Layout private static class ChangeWatcher implements TextWatcher, SpanWatcher { public ChangeWatcher(DynamicLayout layout) { - mLayout = new WeakReference<DynamicLayout>(layout); + mLayout = new WeakReference<>(layout); } private void reflow(CharSequence s, int where, int before, int after) { diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 60fff7387c75..ac5c2e926874 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -319,8 +319,6 @@ public abstract class Layout { private float getJustifyWidth(int lineNum) { Alignment paraAlign = mAlignment; - TabStops tabStops = null; - boolean tabStopsIsInitialized = false; int left = 0; int right = mWidth; @@ -371,10 +369,6 @@ public abstract class Layout { } } - if (getLineContainsTab(lineNum)) { - tabStops = new TabStops(TAB_INCREMENT, spans); - } - final Alignment align; if (paraAlign == Alignment.ALIGN_LEFT) { align = (dir == DIR_LEFT_TO_RIGHT) ? Alignment.ALIGN_NORMAL : Alignment.ALIGN_OPPOSITE; @@ -1423,7 +1417,6 @@ public abstract class Layout { float dist = Math.abs(getHorizontal(max, primary) - horiz); if (dist <= bestdist) { - bestdist = dist; best = max; } @@ -1570,7 +1563,7 @@ public abstract class Layout { // XXX: we don't care about tabs tl.set(mPaint, mText, lineStart, lineEnd, lineDir, directions, false, null); caret = lineStart + tl.getOffsetToLeftRightOf(caret - lineStart, toLeft); - tl = TextLine.recycle(tl); + TextLine.recycle(tl); return caret; } @@ -1894,10 +1887,7 @@ public abstract class Layout { int margin = 0; - boolean isFirstParaLine = lineStart == 0 || - spanned.charAt(lineStart - 1) == '\n'; - - boolean useFirstLineMargin = isFirstParaLine; + boolean useFirstLineMargin = lineStart == 0 || spanned.charAt(lineStart - 1) == '\n'; for (int i = 0; i < spans.length; i++) { if (spans[i] instanceof LeadingMarginSpan2) { int spStart = spanned.getSpanStart(spans[i]); diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 961cd8eef530..4b6b6ae8bf83 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -433,7 +433,6 @@ public class StaticLayout extends Layout { * + addStyleRun (a text run, to be measured in native code) * + addReplacementRun (a replacement run, width is given) * - * After measurement, nGetWidths() is valid if the widths are needed (eg for ellipsis). * Run nComputeLineBreaks() to obtain line breaks for the paragraph. * * After all paragraphs, call finish() to release expensive buffers. @@ -441,8 +440,6 @@ public class StaticLayout extends Layout { private Pair<String, long[]> getLocaleAndHyphenatorIfChanged(TextPaint paint) { final LocaleList locales = paint.getTextLocales(); - final String languageTags; - long[] hyphenators; if (!locales.equals(mLocales)) { mLocales = locales; return new Pair(locales.toLanguageTags(), getHyphenators(locales)); @@ -521,7 +518,7 @@ public class StaticLayout extends Layout { private LocaleList mLocales; - private static final SynchronizedPool<Builder> sPool = new SynchronizedPool<Builder>(3); + private static final SynchronizedPool<Builder> sPool = new SynchronizedPool<>(3); } public StaticLayout(CharSequence source, TextPaint paint, @@ -866,10 +863,9 @@ public class StaticLayout extends Layout { spanEndCacheCount++; } - nGetWidths(b.mNativePtr, widths); int breakCount = nComputeLineBreaks(b.mNativePtr, lineBreaks, lineBreaks.breaks, lineBreaks.widths, lineBreaks.ascents, lineBreaks.descents, lineBreaks.flags, - lineBreaks.breaks.length); + lineBreaks.breaks.length, widths); final int[] breaks = lineBreaks.breaks; final float[] lineWidths = lineBreaks.widths; @@ -947,10 +943,10 @@ public class StaticLayout extends Layout { boolean moreChars = (endPos < bufEnd); final int ascent = fallbackLineSpacing - ? Math.min(fmAscent, (int) Math.round(ascents[breakIndex])) + ? Math.min(fmAscent, Math.round(ascents[breakIndex])) : fmAscent; final int descent = fallbackLineSpacing - ? Math.max(fmDescent, (int) Math.round(descents[breakIndex])) + ? Math.max(fmDescent, Math.round(descents[breakIndex])) : fmDescent; v = out(source, here, endPos, ascent, descent, fmTop, fmBottom, @@ -1177,7 +1173,7 @@ public class StaticLayout extends Layout { mWorkPaint.set(paint); do { final float ellipsizedWidth = guessEllipsis(text, lineStart, lineEnd, widths, - widthStart, tempAvail, where, line, textWidth, mWorkPaint, forceEllipsis, dir); + widthStart, tempAvail, where, line, mWorkPaint, forceEllipsis, dir); if (ellipsizedWidth <= avail) { lineFits = true; } else { @@ -1207,7 +1203,7 @@ public class StaticLayout extends Layout { // This method temporarily modifies the TextPaint passed to it, so the TextPaint passed to it // should not be accessed while the method is running. private float guessEllipsis(CharSequence text, int lineStart, int lineEnd, float[] widths, - int widthStart, float avail, TextUtils.TruncateAt where, int line, float textWidth, + int widthStart, float avail, TextUtils.TruncateAt where, int line, TextPaint paint, boolean forceEllipsis, int dir) { final int savedHyphenEdit = paint.getHyphenEdit(); paint.setHyphenEdit(0); @@ -1551,16 +1547,17 @@ public class StaticLayout extends Layout { @FloatRange(from = 0.0f) float width, @Nullable String languageTags, @Nullable long[] hyphenators); - private static native void nGetWidths(long nativePtr, float[] widths); - // populates LineBreaks and returns the number of breaks found // // the arrays inside the LineBreaks objects are passed in as well // to reduce the number of JNI calls in the common case where the // arrays do not have to be resized + // The individual character widths will be returned in charWidths. The length of charWidths must + // be at least the length of the text. private static native int nComputeLineBreaks(long nativePtr, LineBreaks recycle, int[] recycleBreaks, float[] recycleWidths, float[] recycleAscents, - float[] recycleDescents, int[] recycleFlags, int recycleLength); + float[] recycleDescents, int[] recycleFlags, int recycleLength, + float[] charWidths); private int mLineCount; private int mTopPadding, mBottomPadding; diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index 2dbff100375a..20c0ed87285a 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -73,7 +73,7 @@ class TextLine { new SpanSet<ReplacementSpan>(ReplacementSpan.class); private final DecorationInfo mDecorationInfo = new DecorationInfo(); - private final ArrayList<DecorationInfo> mDecorations = new ArrayList(); + private final ArrayList<DecorationInfo> mDecorations = new ArrayList<>(); private static final TextLine[] sCached = new TextLine[3]; @@ -340,14 +340,14 @@ class TextLine { boolean advance = (mDir == Layout.DIR_RIGHT_TO_LEFT) == runIsRtl; if (inSegment && advance) { - return h += measureRun(segstart, offset, j, runIsRtl, fmi); + return h + measureRun(segstart, offset, j, runIsRtl, fmi); } float w = measureRun(segstart, j, j, runIsRtl, fmi); h += advance ? w : -w; if (inSegment) { - return h += measureRun(segstart, offset, j, runIsRtl, null); + return h + measureRun(segstart, offset, j, runIsRtl, null); } if (codept == '\t') { @@ -828,14 +828,14 @@ class TextLine { } if (info.isUnderlineText) { final float thickness = - Math.max(((Paint) wp).getUnderlineThickness(), 1.0f); + Math.max(wp.getUnderlineThickness(), 1.0f); drawStroke(wp, c, wp.getColor(), wp.getUnderlinePosition(), thickness, decorationXLeft, decorationXRight, y); } if (info.isStrikeThruText) { final float thickness = - Math.max(((Paint) wp).getStrikeThruThickness(), 1.0f); + Math.max(wp.getStrikeThruThickness(), 1.0f); drawStroke(wp, c, wp.getColor(), wp.getStrikeThruPosition(), thickness, decorationXLeft, decorationXRight, y); } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b6be29611aa6..0d1258d6af3f 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -1448,17 +1448,59 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * <p>Enables low quality mode for the drawing cache.</p> + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int DRAWING_CACHE_QUALITY_LOW = 0x00080000; /** * <p>Enables high quality mode for the drawing cache.</p> + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int DRAWING_CACHE_QUALITY_HIGH = 0x00100000; /** * <p>Enables automatic quality mode for the drawing cache.</p> + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int DRAWING_CACHE_QUALITY_AUTO = 0x00000000; private static final int[] DRAWING_CACHE_QUALITY_FLAGS = { @@ -8907,7 +8949,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #isDrawingCacheEnabled() * * @attr ref android.R.styleable#View_drawingCacheQuality + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated @DrawingCacheQuality public int getDrawingCacheQuality() { return mViewFlags & DRAWING_CACHE_QUALITY_MASK; @@ -8925,7 +8981,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #isDrawingCacheEnabled() * * @attr ref android.R.styleable#View_drawingCacheQuality + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void setDrawingCacheQuality(@DrawingCacheQuality int quality) { setFlags(quality, DRAWING_CACHE_QUALITY_MASK); } @@ -18103,7 +18173,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #getDrawingCache() * @see #buildDrawingCache() * @see #setLayerType(int, android.graphics.Paint) + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void setDrawingCacheEnabled(boolean enabled) { mCachingFailed = false; setFlags(enabled ? DRAWING_CACHE_ENABLED : 0, DRAWING_CACHE_ENABLED); @@ -18116,7 +18200,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @see #setDrawingCacheEnabled(boolean) * @see #getDrawingCache() + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated @ViewDebug.ExportedProperty(category = "drawing") public boolean isDrawingCacheEnabled() { return (mViewFlags & DRAWING_CACHE_ENABLED) == DRAWING_CACHE_ENABLED; @@ -18257,7 +18355,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @return A non-scaled bitmap representing this view or null if cache is disabled. * * @see #getDrawingCache(boolean) + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public Bitmap getDrawingCache() { return getDrawingCache(false); } @@ -18288,7 +18400,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #isDrawingCacheEnabled() * @see #buildDrawingCache(boolean) * @see #destroyDrawingCache() + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public Bitmap getDrawingCache(boolean autoScale) { if ((mViewFlags & WILL_NOT_CACHE_DRAWING) == WILL_NOT_CACHE_DRAWING) { return null; @@ -18308,7 +18434,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setDrawingCacheEnabled(boolean) * @see #buildDrawingCache() * @see #getDrawingCache() + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void destroyDrawingCache() { if (mDrawingCache != null) { mDrawingCache.recycle(); @@ -18330,7 +18470,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setDrawingCacheEnabled(boolean) * @see #buildDrawingCache() * @see #getDrawingCache() + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void setDrawingCacheBackgroundColor(@ColorInt int color) { if (color != mDrawingCacheBackgroundColor) { mDrawingCacheBackgroundColor = color; @@ -18342,7 +18496,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setDrawingCacheBackgroundColor(int) * * @return The background color to used for the drawing cache's bitmap + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated @ColorInt public int getDrawingCacheBackgroundColor() { return mDrawingCacheBackgroundColor; @@ -18352,7 +18520,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <p>Calling this method is equivalent to calling <code>buildDrawingCache(false)</code>.</p> * * @see #buildDrawingCache(boolean) + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void buildDrawingCache() { buildDrawingCache(false); } @@ -18379,7 +18561,21 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @see #getDrawingCache() * @see #destroyDrawingCache() + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void buildDrawingCache(boolean autoScale) { if ((mPrivateFlags & PFLAG_DRAWING_CACHE_VALID) == 0 || (autoScale ? mDrawingCache == null : mUnscaledDrawingCache == null)) { diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index b2e5a163d872..929beaea42b8 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -421,22 +421,78 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager /** * Used to indicate that no drawing cache should be kept in memory. + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int PERSISTENT_NO_CACHE = 0x0; /** * Used to indicate that the animation drawing cache should be kept in memory. + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int PERSISTENT_ANIMATION_CACHE = 0x1; /** * Used to indicate that the scrolling drawing cache should be kept in memory. + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int PERSISTENT_SCROLLING_CACHE = 0x2; /** * Used to indicate that all drawing caches should be kept in memory. + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public static final int PERSISTENT_ALL_CACHES = 0x3; // Layout Modes @@ -3769,7 +3825,21 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * Enables or disables the drawing cache for each child of this view group. * * @param enabled true to enable the cache, false to dispose of it + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated protected void setChildrenDrawingCacheEnabled(boolean enabled) { if (enabled || (mPersistentDrawingCache & PERSISTENT_ALL_CACHES) != PERSISTENT_ALL_CACHES) { final View[] children = mChildren; @@ -6331,7 +6401,21 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @return one or a combination of {@link #PERSISTENT_NO_CACHE}, * {@link #PERSISTENT_ANIMATION_CACHE}, {@link #PERSISTENT_SCROLLING_CACHE} * and {@link #PERSISTENT_ALL_CACHES} + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated @ViewDebug.ExportedProperty(category = "drawing", mapping = { @ViewDebug.IntToString(from = PERSISTENT_NO_CACHE, to = "NONE"), @ViewDebug.IntToString(from = PERSISTENT_ANIMATION_CACHE, to = "ANIMATION"), @@ -6352,7 +6436,21 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * @param drawingCacheToKeep one or a combination of {@link #PERSISTENT_NO_CACHE}, * {@link #PERSISTENT_ANIMATION_CACHE}, {@link #PERSISTENT_SCROLLING_CACHE} * and {@link #PERSISTENT_ALL_CACHES} + * + * @deprecated The view drawing cache was largely made obsolete with the introduction of + * hardware-accelerated rendering in API 11. With hardware-acceleration, intermediate cache + * layers are largely unnecessary and can easily result in a net loss in performance due to the + * cost of creating and updating the layer. In the rare cases where caching layers are useful, + * such as for alpha animations, {@link #setLayerType(int, Paint)} handles this with hardware + * rendering. For software-rendered snapshots of a small part of the View hierarchy or + * individual Views it is recommended to create a {@link Canvas} from either a {@link Bitmap} or + * {@link android.graphics.Picture} and call {@link #draw(Canvas)} on the View. However these + * software-rendered usages are discouraged and have compatibility issues with hardware-only + * rendering features such as {@link android.graphics.Bitmap.Config#HARDWARE Config.HARDWARE} + * bitmaps, real-time shadows, and outline clipping. For screenshots of the UI for feedback + * reports or unit testing the {@link PixelCopy} API is recommended. */ + @Deprecated public void setPersistentDrawingCache(int drawingCacheToKeep) { mPersistentDrawingCache = drawingCacheToKeep & PERSISTENT_ALL_CACHES; } diff --git a/core/java/com/android/internal/notification/SystemNotificationChannels.java b/core/java/com/android/internal/notification/SystemNotificationChannels.java index d64c9a1d813b..4a181b27b2e3 100644 --- a/core/java/com/android/internal/notification/SystemNotificationChannels.java +++ b/core/java/com/android/internal/notification/SystemNotificationChannels.java @@ -20,6 +20,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.content.pm.ParceledListSlice; +import android.media.AudioAttributes; import android.os.RemoteException; import android.provider.Settings; @@ -47,6 +48,7 @@ public class SystemNotificationChannels { public static String RETAIL_MODE = "RETAIL_MODE"; public static String USB = "USB"; public static String FOREGROUND_SERVICE = "FOREGROUND_SERVICE"; + public static String HEAVY_WEIGHT_APP = "HEAVY_WEIGHT_APP"; public static void createAll(Context context) { final NotificationManager nm = context.getSystemService(NotificationManager.class); @@ -139,6 +141,17 @@ public class SystemNotificationChannels { foregroundChannel.setBlockableSystem(true); channelsList.add(foregroundChannel); + NotificationChannel heavyWeightChannel = new NotificationChannel( + HEAVY_WEIGHT_APP, + context.getString(R.string.notification_channel_heavy_weight_app), + NotificationManager.IMPORTANCE_DEFAULT); + heavyWeightChannel.setShowBadge(false); + heavyWeightChannel.setSound(null, new AudioAttributes.Builder() + .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) + .setUsage(AudioAttributes.USAGE_NOTIFICATION_EVENT) + .build()); + channelsList.add(heavyWeightChannel); + nm.createNotificationChannels(channelsList); } diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 36fd991cc78d..dd07ddb40ad4 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -681,17 +681,17 @@ public class BatteryStatsImpl extends BatteryStats { } @Override - public long getMahDischarge(int which) { + public long getUahDischarge(int which) { return mDischargeCounter.getCountLocked(which); } @Override - public long getMahDischargeScreenOff(int which) { + public long getUahDischargeScreenOff(int which) { return mDischargeScreenOffCounter.getCountLocked(which); } @Override - public long getMahDischargeScreenDoze(int which) { + public long getUahDischargeScreenDoze(int which) { return mDischargeScreenDozeCounter.getCountLocked(which); } @@ -3588,7 +3588,7 @@ public class BatteryStatsImpl extends BatteryStats { public void updateTimeBasesLocked(boolean unplugged, int screenState, long uptime, long realtime) { - final boolean screenOff = isScreenOff(screenState) || isScreenDoze(screenState); + final boolean screenOff = !isScreenOn(screenState); final boolean updateOnBatteryTimeBase = unplugged != mOnBatteryTimeBase.isRunning(); final boolean updateOnBatteryScreenOffTimeBase = (unplugged && screenOff) != mOnBatteryScreenOffTimeBase.isRunning(); @@ -5427,6 +5427,10 @@ public class BatteryStatsImpl extends BatteryStats { elapsedRealtimeUs, which); } + @Override public Timer getScreenBrightnessTimer(int brightnessBin) { + return mScreenBrightnessTimer[brightnessBin]; + } + @Override public long getInteractiveTime(long elapsedRealtimeUs, int which) { return mInteractiveTimer.getTotalTimeLocked(elapsedRealtimeUs, which); } @@ -5520,10 +5524,18 @@ public class BatteryStatsImpl extends BatteryStats { elapsedRealtimeUs, which); } + @Override public Timer getPhoneSignalScanningTimer() { + return mPhoneSignalScanningTimer; + } + @Override public int getPhoneSignalStrengthCount(int strengthBin, int which) { return mPhoneSignalStrengthsTimer[strengthBin].getCountLocked(which); } + @Override public Timer getPhoneSignalStrengthTimer(int strengthBin) { + return mPhoneSignalStrengthsTimer[strengthBin]; + } + @Override public long getPhoneDataConnectionTime(int dataType, long elapsedRealtimeUs, int which) { return mPhoneDataConnectionsTimer[dataType].getTotalTimeLocked( @@ -5534,6 +5546,10 @@ public class BatteryStatsImpl extends BatteryStats { return mPhoneDataConnectionsTimer[dataType].getCountLocked(which); } + @Override public Timer getPhoneDataConnectionTimer(int dataType) { + return mPhoneDataConnectionsTimer[dataType]; + } + @Override public long getMobileRadioActiveTime(long elapsedRealtimeUs, int which) { return mMobileRadioActiveTimer.getTotalTimeLocked(elapsedRealtimeUs, which); } @@ -5572,6 +5588,10 @@ public class BatteryStatsImpl extends BatteryStats { return mWifiStateTimer[wifiState].getCountLocked(which); } + @Override public Timer getWifiStateTimer(int wifiState) { + return mWifiStateTimer[wifiState]; + } + @Override public long getWifiSupplStateTime(int state, long elapsedRealtimeUs, int which) { return mWifiSupplStateTimer[state].getTotalTimeLocked( @@ -5582,6 +5602,10 @@ public class BatteryStatsImpl extends BatteryStats { return mWifiSupplStateTimer[state].getCountLocked(which); } + @Override public Timer getWifiSupplStateTimer(int state) { + return mWifiSupplStateTimer[state]; + } + @Override public long getWifiSignalStrengthTime(int strengthBin, long elapsedRealtimeUs, int which) { return mWifiSignalStrengthsTimer[strengthBin].getTotalTimeLocked( @@ -5592,6 +5616,10 @@ public class BatteryStatsImpl extends BatteryStats { return mWifiSignalStrengthsTimer[strengthBin].getCountLocked(which); } + @Override public Timer getWifiSignalStrengthTimer(int strengthBin) { + return mWifiSignalStrengthsTimer[strengthBin]; + } + @Override public ControllerActivityCounter getBluetoothControllerActivity() { return mBluetoothActivity; @@ -9463,7 +9491,7 @@ public class BatteryStatsImpl extends BatteryStats { } public boolean isScreenOn(int state) { - return state == Display.STATE_ON; + return state == Display.STATE_ON || state == Display.STATE_VR; } public boolean isScreenOff(int state) { @@ -12791,7 +12819,7 @@ public class BatteryStatsImpl extends BatteryStats { mMobileRadioPowerState = DataConnectionRealTimeInfo.DC_POWER_STATE_LOW; mMobileRadioActiveTimer = new StopwatchTimer(mClocks, null, -400, null, mOnBatteryTimeBase, in); - mMobileRadioActivePerAppTimer = new StopwatchTimer(mClocks, null, -401, null, + mMobileRadioActivePerAppTimer = new StopwatchTimer(mClocks, null, -401, null, mOnBatteryTimeBase, in); mMobileRadioActiveAdjustedTime = new LongSamplingCounter(mOnBatteryTimeBase, in); mMobileRadioActiveUnknownTime = new LongSamplingCounter(mOnBatteryTimeBase, in); diff --git a/core/java/com/android/internal/os/LoggingPrintStream.java b/core/java/com/android/internal/os/LoggingPrintStream.java index f14394ad09ce..d27874cd3be2 100644 --- a/core/java/com/android/internal/os/LoggingPrintStream.java +++ b/core/java/com/android/internal/os/LoggingPrintStream.java @@ -28,12 +28,15 @@ import java.nio.charset.CodingErrorAction; import java.util.Formatter; import java.util.Locale; +import com.android.internal.annotations.VisibleForTesting; + /** * A print stream which logs output line by line. * * {@hide} */ -abstract class LoggingPrintStream extends PrintStream { +@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) +public abstract class LoggingPrintStream extends PrintStream { private final StringBuilder builder = new StringBuilder(); diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index 83ffeffd2da3..1f7277a7e98d 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -166,7 +166,7 @@ static jint nComputeLineBreaks(JNIEnv* env, jclass, jlong nativePtr, jobject recycle, jintArray recycleBreaks, jfloatArray recycleWidths, jfloatArray recycleAscents, jfloatArray recycleDescents, jintArray recycleFlags, - jint recycleLength) { + jint recycleLength, jfloatArray charWidths) { minikin::LineBreaker* b = reinterpret_cast<minikin::LineBreaker*>(nativePtr); size_t nBreaks = b->computeBreaks(); @@ -175,6 +175,8 @@ static jint nComputeLineBreaks(JNIEnv* env, jclass, jlong nativePtr, recycleFlags, recycleLength, nBreaks, b->getBreaks(), b->getWidths(), b->getAscents(), b->getDescents(), b->getFlags()); + env->SetFloatArrayRegion(charWidths, 0, b->size(), b->charWidths()); + b->finish(); return static_cast<jint>(nBreaks); @@ -256,11 +258,6 @@ static void nAddReplacementRun(JNIEnv* env, jclass, jlong nativePtr, b->addReplacement(start, end, width, langTagsString.get(), makeHyphenators(env, hyphenators)); } -static void nGetWidths(JNIEnv* env, jclass, jlong nativePtr, jfloatArray widths) { - minikin::LineBreaker* b = reinterpret_cast<minikin::LineBreaker*>(nativePtr); - env->SetFloatArrayRegion(widths, 0, b->size(), b->charWidths()); -} - static const JNINativeMethod gMethods[] = { // TODO performance: many of these are candidates for fast jni, awaiting guidance {"nNewBuilder", "()J", (void*) nNewBuilder}, @@ -269,8 +266,7 @@ static const JNINativeMethod gMethods[] = { {"nSetupParagraph", "(J[CIFIF[IIIIZ[I[I[II)V", (void*) nSetupParagraph}, {"nAddStyleRun", "(JJIIZLjava/lang/String;[J)V", (void*) nAddStyleRun}, {"nAddReplacementRun", "(JIIFLjava/lang/String;[J)V", (void*) nAddReplacementRun}, - {"nGetWidths", "(J[F)V", (void*) nGetWidths}, - {"nComputeLineBreaks", "(JLandroid/text/StaticLayout$LineBreaks;[I[F[F[F[II)I", + {"nComputeLineBreaks", "(JLandroid/text/StaticLayout$LineBreaks;[I[F[F[F[II[F)I", (void*) nComputeLineBreaks} }; diff --git a/core/jni/eventlog_helper.h b/core/jni/eventlog_helper.h index 1101b837b589..3a05195ebc9e 100644 --- a/core/jni/eventlog_helper.h +++ b/core/jni/eventlog_helper.h @@ -17,6 +17,8 @@ #ifndef FRAMEWORKS_BASE_CORE_JNI_EVENTLOG_HELPER_H_ #define FRAMEWORKS_BASE_CORE_JNI_EVENTLOG_HELPER_H_ +#include <memory> + #include <fcntl.h> #include <android-base/macros.h> @@ -26,6 +28,8 @@ #include <nativehelper/JNIHelp.h> #include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedPrimitiveArray.h> +#include <nativehelper/ScopedUtfChars.h> #include "core_jni_helpers.h" #include "jni.h" @@ -91,20 +95,14 @@ public: android_log_event_list ctx(tag); // Don't throw NPE -- I feel like it's sort of mean for a logging function // to be all crashy if you pass in NULL -- but make the NULL value explicit. - if (value != NULL) { - const char *str = env->GetStringUTFChars(value, NULL); - ctx << str; - env->ReleaseStringUTFChars(value, str); - } else { - ctx << "NULL"; - } + ctx << (value != nullptr ? ScopedUtfChars(env, value).c_str() : "NULL"); return ctx.write(LogID); } static jint writeEventArray(JNIEnv* env, jobject clazz ATTRIBUTE_UNUSED, jint tag, jobjectArray value) { android_log_event_list ctx(tag); - if (value == NULL) { + if (value == nullptr) { ctx << "[NULL]"; return ctx.write(LogID); } @@ -112,26 +110,23 @@ public: jsize copied = 0, num = env->GetArrayLength(value); for (; copied < num && copied < 255; ++copied) { if (ctx.status()) break; - jobject item = env->GetObjectArrayElement(value, copied); - if (item == NULL) { + ScopedLocalRef<jobject> item(env, env->GetObjectArrayElement(value, copied)); + if (item == nullptr) { ctx << "NULL"; - } else if (env->IsInstanceOf(item, gStringClass)) { - const char *str = env->GetStringUTFChars((jstring) item, NULL); - ctx << str; - env->ReleaseStringUTFChars((jstring) item, str); - } else if (env->IsInstanceOf(item, gIntegerClass)) { - ctx << (int32_t)env->GetIntField(item, gIntegerValueID); - } else if (env->IsInstanceOf(item, gLongClass)) { - ctx << (int64_t)env->GetLongField(item, gLongValueID); - } else if (env->IsInstanceOf(item, gFloatClass)) { - ctx << (float)env->GetFloatField(item, gFloatValueID); + } else if (env->IsInstanceOf(item.get(), gStringClass)) { + ctx << ScopedUtfChars(env, (jstring) item.get()).c_str(); + } else if (env->IsInstanceOf(item.get(), gIntegerClass)) { + ctx << (int32_t)env->GetIntField(item.get(), gIntegerValueID); + } else if (env->IsInstanceOf(item.get(), gLongClass)) { + ctx << (int64_t)env->GetLongField(item.get(), gLongValueID); + } else if (env->IsInstanceOf(item.get(), gFloatClass)) { + ctx << (float)env->GetFloatField(item.get(), gFloatValueID); } else { jniThrowException(env, "java/lang/IllegalArgumentException", "Invalid payload item type"); return -1; } - env->DeleteLocalRef(item); } return ctx.write(LogID); } @@ -140,39 +135,37 @@ public: readEvents(env, loggerMode, nullptr, startTime, out); } - static void readEvents(JNIEnv* env, int loggerMode, jintArray tags, jlong startTime, + static void readEvents(JNIEnv* env, int loggerMode, jintArray jTags, jlong startTime, jobject out) { - struct logger_list *logger_list; + std::unique_ptr<struct logger_list, decltype(&android_logger_list_close)> logger_list( + nullptr, android_logger_list_close); if (startTime) { - logger_list = android_logger_list_alloc_time(loggerMode, - log_time(startTime / NS_PER_SEC, startTime % NS_PER_SEC), 0); + logger_list.reset(android_logger_list_alloc_time(loggerMode, + log_time(startTime / NS_PER_SEC, startTime % NS_PER_SEC), 0)); } else { - logger_list = android_logger_list_alloc(loggerMode, 0, 0); + logger_list.reset(android_logger_list_alloc(loggerMode, 0, 0)); } if (!logger_list) { jniThrowIOException(env, errno); return; } - if (!android_logger_open(logger_list, LogID)) { + if (!android_logger_open(logger_list.get(), LogID)) { jniThrowIOException(env, errno); - android_logger_list_free(logger_list); return; } - jsize tagLength = 0; - jint *tagValues = nullptr; - if (tags != nullptr) { - tagLength = env->GetArrayLength(tags); - tagValues = env->GetIntArrayElements(tags, NULL); + ScopedIntArrayRO tags(env); + if (jTags != nullptr) { + tags.reset(jTags); } while (1) { log_msg log_msg; - int ret = android_logger_list_read(logger_list, &log_msg); + int ret = android_logger_list_read(logger_list.get(), &log_msg); if (ret == 0) { - break; + return; } if (ret < 0) { if (ret == -EINTR) { @@ -183,7 +176,7 @@ public: } else if (ret != -EAGAIN) { jniThrowIOException(env, -ret); // Will throw on return } - break; + return; } if (log_msg.id() != LogID) { @@ -192,10 +185,10 @@ public: int32_t tag = * (int32_t *) log_msg.msg(); - if (tags != nullptr) { + if (jTags != nullptr) { bool found = false; - for (int i = 0; !found && i < tagLength; ++i) { - found = (tag == tagValues[i]); + for (size_t i = 0; !found && i < tags.size(); ++i) { + found = (tag == tags[i]); } if (!found) { continue; @@ -203,33 +196,27 @@ public: } jsize len = ret; - jbyteArray array = env->NewByteArray(len); - if (array == NULL) { - break; + ScopedLocalRef<jbyteArray> array(env, env->NewByteArray(len)); + if (array == nullptr) { + return; } - jbyte *bytes = env->GetByteArrayElements(array, NULL); - memcpy(bytes, log_msg.buf, len); - env->ReleaseByteArrayElements(array, bytes, 0); + { + ScopedByteArrayRW bytes(env, array.get()); + memcpy(bytes.get(), log_msg.buf, len); + } - jobject event = env->NewObject(gEventClass, gEventInitID, array); - if (event == NULL) { - break; + ScopedLocalRef<jobject> event(env, + env->NewObject(gEventClass, gEventInitID, array.get())); + if (event == nullptr) { + return; } - env->CallBooleanMethod(out, gCollectionAddID, event); - env->DeleteLocalRef(event); - env->DeleteLocalRef(array); + env->CallBooleanMethod(out, gCollectionAddID, event.get()); if (env->ExceptionCheck() == JNI_TRUE) { - break; + return; } } - - android_logger_list_close(logger_list); - - if (tags != nullptr) { - env->ReleaseIntArrayElements(tags, tagValues, 0); - } } private: diff --git a/core/proto/android/os/batterystats.proto b/core/proto/android/os/batterystats.proto index 86e31d0940db..8d850384ffe3 100644 --- a/core/proto/android/os/batterystats.proto +++ b/core/proto/android/os/batterystats.proto @@ -20,6 +20,8 @@ option java_multiple_files = true; package android.os; +import "frameworks/base/core/proto/android/telephony/signalstrength.proto"; + message BatteryStatsProto { int32 report_version = 1; int64 parcel_version = 2; @@ -55,6 +57,383 @@ message ControllerActivityProto { } message SystemProto { + message Battery { + // Wall clock time when the data collection started. + // In case of device time manually reset by users: + // start_clock_time_ms keeps the same value in the current collection + // period and changes for later collection periods. + int64 start_clock_time_ms = 1; + // #times the device has been started since start_clock_time_millis. + int64 start_count = 2; + // Total realtime duration (= SINCE_UNPLUGGED battery_realtime_millis.) + int64 total_realtime_ms = 3; + int64 total_uptime_ms = 4; + // Realtime duration on battery. + int64 battery_realtime_ms = 5; + // Uptime duration (i.e., not suspend). + // Uptime is anytime the CPUs were on. The radio and Wifi chip + // can be running while the CPUs are off. + int64 battery_uptime_ms = 6; + // Total realtime duration measured with screen off or dozing. + int64 screen_off_realtime_ms = 7; + // Total uptime duration measured with screen off or dozing. + int64 screen_off_uptime_ms = 8; + // Total time the screen was dozing while the device was running on battery. + // For historical reasons, screen_doze_duration_msec is a subset of + // screen_off_realtime_msec. + int64 screen_doze_duration_ms = 9; + // The estimated real battery capacity, which may be less than the declared + // battery capacity (for example, because of battery aging). This field is + // less reliable than min(max)_learned_battery_capacity_uah, use those two + // fields whenever possible. + int64 estimated_battery_capacity_mah = 10; + // The minimum learned battery capacity in uAh. + int64 min_learned_battery_capacity_uah = 11; + // The maximum learned battery capacity in uAh. + int64 max_learned_battery_capacity_uah = 12; + }; + Battery battery = 1; + + message BatteryDischarge { + // Discharged battery percentage points since the stats were last reset + // after charging (lower bound approximation). + int32 lower_bound_since_charge = 1; + // Upper bound approximation. + int32 upper_bound_since_charge = 2; + // Discharged points while screen is on. + int32 screen_on_since_charge = 3; + // Discharged points while screen is off. + int32 screen_off_since_charge = 4; + // Discharged points while screen was dozing. For historical reasons, + // screen_doze_since_charge is a subset of screen_off_since_charge. + int32 screen_doze_since_charge = 5; + // Total amount of battery discharged in mAh. This will only be non-zero for + // devices that report battery discharge via a coulomb counter. + int64 total_mah = 6; + // Total amount of battery discharged while the screen was off in mAh. + // This will only be non-zero for devices that report battery discharge + // via a coulomb counter. + int64 total_mah_screen_off = 7; + // Total amount of battery discharged while the screen was dozing in mAh. + // This will only be non-zero for devices that report battery discharge + // via a coulomb counter. For historical reasons, total_mah_screen_doze is + // a subset of total_mah_screen_off. + int64 total_mah_screen_doze = 8; + }; + BatteryDischarge battery_discharge = 2; + + oneof time_remaining { + // Approximation for how much time remains until the battery is fully + // charged. The device will print -1 if there wasn't enough data to + // calculate an estimate, or if the battery is currently discharging. + int64 charge_time_remaining_ms = 3; + // Approximation for how much time remains until the battery is fully + // discharged. The device will print -1 if there wasn't enough data to + // calculate an estimate, or if the battery is currently charging. + int64 discharge_time_remaining_ms = 4; + } + + // BatteryLevelStep tracks data for which conditions were continuously held for + // the entire duration. Field for which the conditions were not consistent + // for the entire duration should be marked MIXED. + message BatteryLevelStep { + // How long the battery was at the current level. + int64 duration_ms = 1; + // Battery level + int32 level = 2; + + // State of the display. A special enum is used rather than + // DisplayProto.State because a MIXED value needs to be in the enum, and + // batterystats doesn't care about all of the different display states. + enum DisplayState { + DS_MIXED = 0; + DS_ON = 1; + DS_OFF = 2; + DS_DOZE = 3; + DS_DOZE_SUSPEND = 4; + // Any display state error that comes through should be sent to hackbod@. + DS_ERROR = 5; + } + // The state of the display for the entire battery level step. MIXED is used + // if there were multiple states for this step. + DisplayState display_state = 3; + + // Indicates status in power save mode. + enum PowerSaveMode { + PSM_MIXED = 0; + PSM_ON = 1; + PSM_OFF = 2; + } + // Battery Saver mode for the entire battery level step. MIXED is used + // if there were multiple states for this step. + PowerSaveMode power_save_mode = 4; + + // Indicates status in idle mode. + enum IdleMode { + IM_MIXED = 0; + IM_ON = 2; + IM_OFF = 3; + } + // Doze mode for the entire battery level step. MIXED is used if there were + // multiple states for this step. + IdleMode idle_mode = 5; + }; + // Battery level steps when the device was charging. + repeated BatteryLevelStep charge_step = 5; + // Battery level steps when the device was discharging. + repeated BatteryLevelStep discharge_step = 6; + + // All CPU frequencies of the device. + repeated int64 cpu_frequency = 7; + + message DataConnection { + enum Name { + NONE = 0; + GPRS = 1; + EDGE = 2; + UMTS = 3; + CDMA = 4; + EVDO_0 = 5; + EVDO_A = 6; + ONE_X_RTT = 7; // 1xRTT. + HSDPA = 8; + HSUPA = 9; + HSPA = 10; + IDEN = 11; + EVDO_B = 12; + LTE = 13; + EHRPD = 14; + HSPAP = 15; + OTHER = 16; + }; + Name name = 1; + TimerProto total = 2; + }; + repeated DataConnection data_connection = 8; + + ControllerActivityProto global_bluetooth_controller = 9; + ControllerActivityProto global_modem_controller = 10; + ControllerActivityProto global_wifi_controller = 11; + + message GlobalNetwork { + // Total Bytes received on mobile connections. + int64 mobile_bytes_rx = 1; + // Total Bytes transmitted on mobile connections. + int64 mobile_bytes_tx = 2; + // Total Bytes received on wifi connections. + int64 wifi_bytes_rx = 3; + // Total Bytes transmitted on wifi connections. + int64 wifi_bytes_tx = 4; + // Total Packets received on mobile connections. + int64 mobile_packets_rx = 5; + // Total Packets transmitted on mobile connections. + int64 mobile_packets_tx = 6; + // Total Packets received on wifi connections. + int64 wifi_packets_rx = 7; + // Total Packets transmitted on wifi connections. + int64 wifi_packets_tx = 8; + // Total Bytes received on bluetooth connections. + int64 bt_bytes_rx = 9; + // Total Bytes transmitted on bluetooth connections. + int64 bt_bytes_tx = 10; + }; + GlobalNetwork global_network = 12; + + message GlobalWifi { + // The amount of time that wifi has been on while the device was running on + // battery. + int64 on_duration_ms = 1; + // The amount of time that wifi has been on and the driver has been in the + // running state while the device was running on battery. + int64 running_duration_ms = 2; + } + GlobalWifi global_wifi = 13; + + // Kernel wakelock metrics are only recorded when the device is unplugged + // *and* the screen is off. + message KernelWakelock { + string name = 1; + // Kernel wakelock stats aren't apportioned across all kernel wakelocks (as + // app wakelocks stats are). + TimerProto total = 2; + // The kernel doesn't have the data to enable printing out current and max + // durations. + }; + repeated KernelWakelock kernel_wakelock = 14; + + message Misc { + int64 screen_on_duration_ms = 1; + int64 phone_on_duration_ms = 2; + int64 full_wakelock_total_duration_ms = 3; + // The total elapsed time that a partial wakelock was held. This duration + // does not double count wakelocks held at the same time. + int64 partial_wakelock_total_duration_ms = 4; + int64 mobile_radio_active_duration_ms = 5; + // The time that is the difference between the mobile radio time we saw + // based on the elapsed timestamp when going down vs. the given time stamp + // from the radio. + int64 mobile_radio_active_adjusted_time_ms = 6; + int32 mobile_radio_active_count = 7; + // The amount of time that the mobile network has been active (in a high + // power state) but not being able to blame on an app. + int32 mobile_radio_active_unknown_duration_ms = 8; + // Total amount of time the device was in the interactive state. + int64 interactive_duration_ms = 9; + int64 battery_saver_mode_enabled_duration_ms = 10; + int32 num_connectivity_changes = 11; + // Amount of time the device was in deep Doze. + int64 deep_doze_enabled_duration_ms = 12; + // How many times the device went into deep Doze mode. + int32 deep_doze_count = 13; + // Amount of time the device was idling in deep Doze. Idling time + // encompasses "doze" time and the maintenance windows that allow apps to + // operate. + int64 deep_doze_idling_duration_ms = 14; + // How many times the device idling for deep Doze mode. + int32 deep_doze_idling_count = 15; + int64 longest_deep_doze_duration_ms = 16; + // Amount of time the device was in Doze Light. + int64 light_doze_enabled_duration_ms = 17; + // How many times the device went into Doze Light mode. + int32 light_doze_count = 18; + // Amount of time the device was idling in Doze Light. Idling time + // encompasses "doze" time and the maintenance windows that allow apps to + // operate. + int64 light_doze_idling_duration_ms = 19; + // How many times the device idling for Doze Light mode. + int32 light_doze_idling_count = 20; + int64 longest_light_doze_duration_ms = 21; + } + Misc misc = 15; + + message PhoneSignalStrength { + android.telephony.SignalStrengthProto.StrengthName name = 1; + TimerProto total = 2; + }; + repeated PhoneSignalStrength phone_signal_strength = 16; + + message PowerUseItem { + enum Sipper { + UNKNOWN_SIPPER = 0; + IDLE = 1; + CELL = 2; + PHONE = 3; + WIFI = 4; + BLUETOOTH = 5; + FLASHLIGHT = 6; + SCREEN = 7; + USER = 8; + UNACCOUNTED = 9; + OVERCOUNTED = 10; + CAMERA = 11; + MEMORY = 12; + }; + Sipper name = 1; + // UID, only valid for the USER sipper. + int32 uid = 2; + // Estimated power use in mAh. + double computed_power_mah = 3; + // Starting in Oreo, Battery Settings has two modes to display the battery + // info. The first is "app usage list". In this mode, items with should_hide + // enabled are hidden. + bool should_hide = 4; + // Smeared power from screen usage. Screen usage power is split and smeared + // among apps, based on activity time. + double screen_power_mah = 5; + // Smeared power using proportional method. Power usage from hidden sippers + // is smeared to all apps proportionally (except for screen usage). + double proportional_smear_mah = 6; + }; + repeated PowerUseItem power_use_item = 17; + + message PowerUseSummary { + double battery_capacity_mah = 1; + double computed_power_mah = 2; + // Lower bound of actual power drained. + double min_drained_power_mah = 3; + // Upper bound of actual power drained. + double max_drained_power_mah = 4; + }; + PowerUseSummary power_use_summary = 18; + + message ResourcePowerManager { + string name = 1; + TimerProto total = 2; + TimerProto screen_off = 3; + } + ResourcePowerManager resource_power_manager = 19; + + message ScreenBrightness { + enum Name { + DARK = 0; // Not screen-off. + DIM = 1; + MEDIUM = 2; + LIGHT = 3; + BRIGHT = 4; + }; + Name name = 1; + TimerProto total = 2; + }; + repeated ScreenBrightness screen_brightness = 20; + + // Duration and number of times trying to acquire a signal + TimerProto signal_scanning = 21; + + message WakeupReason { + string name = 1; + TimerProto total = 2; + }; + repeated WakeupReason wakeup_reason = 22; + + message WifiSignalStrength { + enum Name { + NONE = 0; + POOR = 1; + MODERATE = 2; + GOOD = 3; + GREAT = 4; + }; + Name name = 1; + TimerProto total = 2; + }; + repeated WifiSignalStrength wifi_signal_strength = 23; + + message WifiState { + enum Name { + OFF = 0; + OFF_SCANNING = 1; + ON_NO_NETWORKS = 2; + ON_DISCONNECTED = 3; + ON_CONNECTED_STA = 4; + ON_CONNECTED_P2P = 5; + ON_CONNECTED_STA_P2P = 6; + SOFT_AP = 7; + }; + Name name = 1; + TimerProto total = 2; + }; + repeated WifiState wifi_state = 24; + + message WifiSupplicantState { + enum Name { + INVALID = 0; + DISCONNECTED = 1; + INTERFACE_DISABLED = 2; + INACTIVE = 3; + SCANNING = 4; + AUTHENTICATING = 5; + ASSOCIATING = 6; + ASSOCIATED = 7; + FOUR_WAY_HANDSHAKE = 8; + GROUP_HANDSHAKE = 9; + COMPLETED = 10; + DORMANT = 11; + UNINITIALIZED = 12; + }; + Name name = 1; + TimerProto total = 2; + }; + repeated WifiSupplicantState wifi_supplicant_state = 25; } message TimerProto { diff --git a/core/proto/android/telephony/signalstrength.proto b/core/proto/android/telephony/signalstrength.proto new file mode 100644 index 000000000000..ff230cba6a57 --- /dev/null +++ b/core/proto/android/telephony/signalstrength.proto @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +syntax = "proto3"; + +option java_package = "android.telephony"; +option java_multiple_files = true; + +package android.telephony; + +/** + * An android.telephony.SignalStrength object. + */ +message SignalStrengthProto { + enum StrengthName { + SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; + SIGNAL_STRENGTH_POOR = 1; + SIGNAL_STRENGTH_MODERATE = 2; + SIGNAL_STRENGTH_GOOD = 3; + SIGNAL_STRENGTH_GREAT = 4; + } +} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ff579a6e07d8..3d5ae3dbf537 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -551,6 +551,9 @@ <protected-broadcast android:name="android.media.tv.action.CHANNEL_BROWSABLE_REQUESTED" /> <protected-broadcast android:name="com.android.server.InputMethodManagerService.SHOW_INPUT_METHOD_PICKER" /> + <!-- Made protected in P (was introduced in JB-MR2) --> + <protected-broadcast android:name="android.intent.action.GET_RESTRICTION_ENTRIES" /> + <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> <!-- ====================================================================== --> diff --git a/core/res/res/values-mcc001-mnc01/strings.xml b/core/res/res/values-mcc001-mnc01/strings.xml new file mode 100644 index 000000000000..96af975b50b5 --- /dev/null +++ b/core/res/res/values-mcc001-mnc01/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc030/strings.xml b/core/res/res/values-mcc310-mnc030/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc310-mnc030/strings.xml +++ b/core/res/res/values-mcc310-mnc030/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc310-mnc150/strings.xml b/core/res/res/values-mcc310-mnc150/strings.xml new file mode 100644 index 000000000000..96af975b50b5 --- /dev/null +++ b/core/res/res/values-mcc310-mnc150/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc170/strings.xml b/core/res/res/values-mcc310-mnc170/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc310-mnc170/strings.xml +++ b/core/res/res/values-mcc310-mnc170/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc310-mnc280/strings.xml b/core/res/res/values-mcc310-mnc280/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc310-mnc280/strings.xml +++ b/core/res/res/values-mcc310-mnc280/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc310-mnc410/strings.xml b/core/res/res/values-mcc310-mnc410/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc310-mnc410/strings.xml +++ b/core/res/res/values-mcc310-mnc410/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc310-mnc560/strings.xml b/core/res/res/values-mcc310-mnc560/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc310-mnc560/strings.xml +++ b/core/res/res/values-mcc310-mnc560/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc310-mnc950/strings.xml b/core/res/res/values-mcc310-mnc950/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc310-mnc950/strings.xml +++ b/core/res/res/values-mcc310-mnc950/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc311-mnc180/strings.xml b/core/res/res/values-mcc311-mnc180/strings.xml index a3fea29070f5..6a404d5cee5f 100644 --- a/core/res/res/values-mcc311-mnc180/strings.xml +++ b/core/res/res/values-mcc311-mnc180/strings.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string> <string name="mmcc_illegal_ms">SIM not allowed MM#3</string> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> </resources> diff --git a/core/res/res/values-mcc312-mnc670/strings.xml b/core/res/res/values-mcc312-mnc670/strings.xml new file mode 100644 index 000000000000..96af975b50b5 --- /dev/null +++ b/core/res/res/values-mcc312-mnc670/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> +</resources> diff --git a/core/res/res/values-mcc313-mnc100/strings.xml b/core/res/res/values-mcc313-mnc100/strings.xml new file mode 100644 index 000000000000..96af975b50b5 --- /dev/null +++ b/core/res/res/values-mcc313-mnc100/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="mmcc_illegal_me">Phone not allowed MM#6</string> +</resources> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 11cdb76f2c1b..4b9839fee254 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2546,16 +2546,24 @@ <attr name="filterTouchesWhenObscured" format="boolean" /> <!-- Defines the quality of translucent drawing caches. This property is used - only when the drawing cache is enabled and translucent. The default value is auto. --> + only when the drawing cache is enabled and translucent. The default value is auto. + Deprecated: The view drawing cache was largely made obsolete with the introduction of + hardware-accelerated rendering in API 11. --> <attr name="drawingCacheQuality"> <!-- Lets the framework decide what quality level should be used - for the drawing cache. --> + for the drawing cache. + Deprecated: The view drawing cache was largely made obsolete with the introduction + of hardware-accelerated rendering in API 11. --> <enum name="auto" value="0" /> <!-- Low quality. When set to low quality, the drawing cache uses a lower color - depth, thus losing precision in rendering gradients, but uses less memory. --> + depth, thus losing precision in rendering gradients, but uses less memory. + Deprecated: The view drawing cache was largely made obsolete with the introduction + of hardware-accelerated rendering in API 11. --> <enum name="low" value="1" /> <!-- High quality. When set to high quality, the drawing cache uses a higher - color depth but uses more memory. --> + color depth but uses more memory. + Deprecated: The view drawing cache was largely made obsolete with the introduction + of hardware-accelerated rendering in API 11. --> <enum name="high" value="2" /> </attr> @@ -3060,7 +3068,9 @@ instance during a scrolling.) This property lets you persist the cache in memory after its initial usage. Persisting the cache consumes more memory but may prevent frequent garbage collection is the cache is created - over and over again. By default the persistence is set to scrolling. --> + over and over again. By default the persistence is set to scrolling. + Deprecated: The view drawing cache was largely made obsolete with the introduction of + hardware-accelerated rendering in API 11. --> <attr name="persistentDrawingCache"> <!-- The drawing cache is not persisted after use. --> <flag name="none" value="0x0" /> @@ -3072,7 +3082,9 @@ <flag name="all" value="0x3" /> </attr> <!-- Defines whether the ViewGroup should always draw its children using their - drawing cache or not. The default value is true. --> + drawing cache or not. The default value is true. + Deprecated: The view drawing cache was largely made obsolete with the introduction of + hardware-accelerated rendering in API 11. --> <attr name="alwaysDrawnWithCache" format="boolean" /> <!-- Sets whether this ViewGroup's drawable states also include its children's drawable states. This is used, for example, to diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index e6c829fc0c0c..0e9028708d66 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1449,8 +1449,7 @@ quit it. Only one such app can be running at a time; if the user tries to launch a second such app, they will be prompted to quit the first before doing so. While the - application is running, the user will be informed of this. - @hide --> + application is running, the user will be informed of this. --> <attr name="cantSaveState" format="boolean" /> <attr name="uiOptions" /> <!-- Declare that your application will be able to deal with RTL (right to left) layouts. diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 108ac1cab44e..0364b816bdb1 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2745,18 +2745,6 @@ <!-- =============================================================== Resources added in version O of the platform - - NOTE: add <public> elements within a <public-group> like so: - - <public-group type="attr" first-id="0x01010531"> - <public name="exampleAttr1" /> - <public name="exampleAttr2" /> - </public-group> - - To add a new public-group block, choose an id value that is 1 greater - than the last of that item above. For example, the last "attr" id - value above is 0x01010530, so the public-group of attrs below has - the id value of 0x01010531. =============================================================== --> <eat-comment /> @@ -2827,18 +2815,6 @@ <!-- =============================================================== Resources added in version O MR1 of the platform - - NOTE: add <public> elements within a <public-group> like so: - - <public-group type="attr" first-id="0x01010531"> - <public name="exampleAttr1" /> - <public name="exampleAttr2" /> - </public-group> - - To add a new public-group block, choose an id value that is 1 greater - than the last of that item above. For example, the last "attr" id - value above is 0x01010530, so the public-group of attrs below has - the id value of 0x01010531. =============================================================== --> <eat-comment /> @@ -2868,6 +2844,7 @@ <eat-comment /> <public-group type="attr" first-id="0x0101056e"> + <public name="cantSaveState" /> </public-group> <public-group type="style" first-id="0x010302e0"> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 5189e7fad0d5..085241a49319 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -591,6 +591,11 @@ <!-- Text shown when viewing channel settings for notifications related to a usb connection --> <string name="notification_channel_usb">USB connection</string> + <!-- Text shown when viewing channel settings for notification about a heavy-weight app + currently running. + [CHAR_LIMIT=NONE] --> + <string name="notification_channel_heavy_weight_app">App running</string> + <!-- This is the label for the notification channel settings that controls the behavior of the notification about applications that are running in the background (that is, perhaps confusingly, running foreground services but not the foreground UI on the screen). diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 53d09d84b721..44a10e8178d1 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3033,6 +3033,7 @@ <java-symbol type="string" name="notification_channel_alerts" /> <java-symbol type="string" name="notification_channel_retail_mode" /> <java-symbol type="string" name="notification_channel_usb" /> + <java-symbol type="string" name="notification_channel_heavy_weight_app" /> <java-symbol type="string" name="config_defaultAutofillService" /> <java-symbol type="string" name="notification_channel_foreground_service" /> diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index dbc9e5d55e37..15eab1f72aab 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -36,7 +36,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ ub-uiautomator \ platform-test-annotations \ compatibility-device-util \ - truth-prebuilt + truth-prebuilt \ + print-test-util-lib LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common org.apache.http.legacy LOCAL_PACKAGE_NAME := FrameworksCoreTests diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index ac5d224c9030..9c0543b18f8b 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -102,6 +102,7 @@ <!-- os storage test permissions --> <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> <uses-permission android:name="android.permission.ASEC_ACCESS" /> + <uses-permission android:name="android.permission.ASEC_ACCESS" /> <uses-permission android:name="android.permission.ASEC_CREATE" /> <uses-permission android:name="android.permission.ASEC_DESTROY" /> <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT" /> @@ -1345,10 +1346,12 @@ </intent-filter> </activity> - <activity android:name="android.print.PrintTestActivity"/> + <activity + android:name="android.print.test.PrintDocumentActivity" + android:theme="@style/Theme" /> <service - android:name="android.print.mockservice.MockPrintService" + android:name="android.print.test.services.FirstPrintService" android:permission="android.permission.BIND_PRINT_SERVICE"> <intent-filter> <action android:name="android.printservice.PrintService" /> @@ -1360,9 +1363,10 @@ </service> <activity - android:name="android.print.mockservice.SettingsActivity" + android:name="android.print.test.services.SettingsActivity" android:permission="android.permission.START_PRINT_SERVICE_CONFIG_ACTIVITY" - android:exported="true"> + android:exported="true" + android:theme="@style/Theme"> </activity> <activity diff --git a/core/tests/coretests/src/android/print/BasePrintTest.java b/core/tests/coretests/src/android/print/BasePrintTest.java deleted file mode 100644 index a70c6046b230..000000000000 --- a/core/tests/coretests/src/android/print/BasePrintTest.java +++ /dev/null @@ -1,324 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.print; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doCallRealMethod; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import android.annotation.NonNull; -import android.app.Instrumentation; -import android.content.Context; -import android.content.pm.PackageManager; -import android.os.CancellationSignal; -import android.os.ParcelFileDescriptor; -import android.os.SystemClock; -import android.print.mockservice.PrintServiceCallbacks; -import android.print.mockservice.PrinterDiscoverySessionCallbacks; -import android.print.mockservice.StubbablePrinterDiscoverySession; -import android.printservice.CustomPrinterIconCallback; -import android.printservice.PrintJob; -import android.printservice.PrintService; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.uiautomator.UiDevice; - -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.mockito.stubbing.Answer; - -import java.io.FileInputStream; -import java.io.IOException; -import java.util.List; -import java.util.concurrent.TimeoutException; - -/** - * This is the base class for print tests. - */ -abstract class BasePrintTest { - protected static final long OPERATION_TIMEOUT = 30000; - private static final String PM_CLEAR_SUCCESS_OUTPUT = "Success"; - private static final int CURRENT_USER_ID = -2; // Mirrors UserHandle.USER_CURRENT - - private android.print.PrintJob mPrintJob; - - private CallCounter mStartCallCounter; - private CallCounter mStartSessionCallCounter; - - private static Instrumentation sInstrumentation; - private static UiDevice sUiDevice; - - @Rule - public ActivityTestRule<PrintTestActivity> mActivityRule = - new ActivityTestRule<>(PrintTestActivity.class, false, true); - - /** - * {@link Runnable} that can throw and {@link Exception} - */ - interface Invokable { - /** - * Execute the invokable - * - * @throws Exception - */ - void run() throws Exception; - } - - /** - * Assert that the invokable throws an expectedException - * - * @param invokable The {@link Invokable} to run - * @param expectedClass The {@link Exception} that is supposed to be thrown - */ - void assertException(Invokable invokable, Class<? extends Exception> expectedClass) - throws Exception { - try { - invokable.run(); - } catch (Exception e) { - if (e.getClass().isAssignableFrom(expectedClass)) { - return; - } else { - throw e; - } - } - - throw new AssertionError("No exception thrown"); - } - - /** - * Return the UI device - * - * @return the UI device - */ - public UiDevice getUiDevice() { - return sUiDevice; - } - - protected static Instrumentation getInstrumentation() { - return sInstrumentation; - } - - @BeforeClass - public static void setUpClass() throws Exception { - sInstrumentation = InstrumentationRegistry.getInstrumentation(); - assumeTrue(sInstrumentation.getContext().getPackageManager().hasSystemFeature( - PackageManager.FEATURE_PRINTING)); - - sUiDevice = UiDevice.getInstance(sInstrumentation); - - // Make sure we start with a clean slate. - clearPrintSpoolerData(); - - // Workaround for dexmaker bug: https://code.google.com/p/dexmaker/issues/detail?id=2 - // Dexmaker is used by mockito. - System.setProperty("dexmaker.dexcache", getInstrumentation() - .getTargetContext().getCacheDir().getPath()); - } - - @Before - public void initCounters() throws Exception { - // Initialize the latches. - mStartCallCounter = new CallCounter(); - mStartSessionCallCounter = new CallCounter(); - } - - @Before - public void unlockScreen() throws Exception { - // Unlock screen. - runShellCommand(getInstrumentation(), "input keyevent KEYCODE_WAKEUP"); - runShellCommand(getInstrumentation(), "wm dismiss-keyguard"); - } - - @After - public void exitActivities() throws Exception { - // Exit print spooler - getUiDevice().pressBack(); - getUiDevice().pressBack(); - } - - protected android.print.PrintJob print(@NonNull final PrintDocumentAdapter adapter, - final PrintAttributes attributes) { - // Initiate printing as if coming from the app. - getInstrumentation().runOnMainSync(() -> { - PrintManager printManager = (PrintManager) getActivity() - .getSystemService(Context.PRINT_SERVICE); - mPrintJob = printManager.print("Print job", adapter, attributes); - }); - - return mPrintJob; - } - - protected void onStartCalled() { - mStartCallCounter.call(); - } - - protected void onPrinterDiscoverySessionStartCalled() { - mStartSessionCallCounter.call(); - } - - protected void waitForPrinterDiscoverySessionStartCallbackCalled() { - waitForCallbackCallCount(mStartSessionCallCounter, 1, - "Did not get expected call to onStartPrinterDiscoverySession."); - } - - protected void waitForStartAdapterCallbackCalled() { - waitForCallbackCallCount(mStartCallCounter, 1, "Did not get expected call to start."); - } - - private static void waitForCallbackCallCount(CallCounter counter, int count, String message) { - try { - counter.waitForCount(count, OPERATION_TIMEOUT); - } catch (TimeoutException te) { - fail(message); - } - } - - protected PrintTestActivity getActivity() { - return mActivityRule.getActivity(); - } - - public static String runShellCommand(Instrumentation instrumentation, String cmd) - throws IOException { - ParcelFileDescriptor pfd = instrumentation.getUiAutomation().executeShellCommand(cmd); - byte[] buf = new byte[512]; - int bytesRead; - FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd); - StringBuilder stdout = new StringBuilder(); - while ((bytesRead = fis.read(buf)) != -1) { - stdout.append(new String(buf, 0, bytesRead)); - } - fis.close(); - return stdout.toString(); - } - - protected static void clearPrintSpoolerData() throws Exception { - assertTrue("failed to clear print spooler data", - runShellCommand(getInstrumentation(), String.format( - "pm clear --user %d %s", CURRENT_USER_ID, - PrintManager.PRINT_SPOOLER_PACKAGE_NAME)) - .contains(PM_CLEAR_SUCCESS_OUTPUT)); - } - - @SuppressWarnings("unchecked") - protected PrinterDiscoverySessionCallbacks createMockPrinterDiscoverySessionCallbacks( - Answer<Void> onStartPrinterDiscovery, Answer<Void> onStopPrinterDiscovery, - Answer<Void> onValidatePrinters, Answer<Void> onStartPrinterStateTracking, - Answer<Void> onRequestCustomPrinterIcon, Answer<Void> onStopPrinterStateTracking, - Answer<Void> onDestroy) { - PrinterDiscoverySessionCallbacks callbacks = mock(PrinterDiscoverySessionCallbacks.class); - - doCallRealMethod().when(callbacks).setSession(any(StubbablePrinterDiscoverySession.class)); - when(callbacks.getSession()).thenCallRealMethod(); - - if (onStartPrinterDiscovery != null) { - doAnswer(onStartPrinterDiscovery).when(callbacks).onStartPrinterDiscovery( - any(List.class)); - } - if (onStopPrinterDiscovery != null) { - doAnswer(onStopPrinterDiscovery).when(callbacks).onStopPrinterDiscovery(); - } - if (onValidatePrinters != null) { - doAnswer(onValidatePrinters).when(callbacks).onValidatePrinters( - any(List.class)); - } - if (onStartPrinterStateTracking != null) { - doAnswer(onStartPrinterStateTracking).when(callbacks).onStartPrinterStateTracking( - any(PrinterId.class)); - } - if (onRequestCustomPrinterIcon != null) { - doAnswer(onRequestCustomPrinterIcon).when(callbacks).onRequestCustomPrinterIcon( - any(PrinterId.class), any(CancellationSignal.class), - any(CustomPrinterIconCallback.class)); - } - if (onStopPrinterStateTracking != null) { - doAnswer(onStopPrinterStateTracking).when(callbacks).onStopPrinterStateTracking( - any(PrinterId.class)); - } - if (onDestroy != null) { - doAnswer(onDestroy).when(callbacks).onDestroy(); - } - - return callbacks; - } - - protected PrintServiceCallbacks createMockPrintServiceCallbacks( - Answer<PrinterDiscoverySessionCallbacks> onCreatePrinterDiscoverySessionCallbacks, - Answer<Void> onPrintJobQueued, Answer<Void> onRequestCancelPrintJob) { - final PrintServiceCallbacks service = mock(PrintServiceCallbacks.class); - - doCallRealMethod().when(service).setService(any(PrintService.class)); - when(service.getService()).thenCallRealMethod(); - - if (onCreatePrinterDiscoverySessionCallbacks != null) { - doAnswer(onCreatePrinterDiscoverySessionCallbacks).when(service) - .onCreatePrinterDiscoverySessionCallbacks(); - } - if (onPrintJobQueued != null) { - doAnswer(onPrintJobQueued).when(service).onPrintJobQueued(any(PrintJob.class)); - } - if (onRequestCancelPrintJob != null) { - doAnswer(onRequestCancelPrintJob).when(service).onRequestCancelPrintJob( - any(PrintJob.class)); - } - - return service; - } - - private static final class CallCounter { - private final Object mLock = new Object(); - - private int mCallCount; - - public void call() { - synchronized (mLock) { - mCallCount++; - mLock.notifyAll(); - } - } - - int getCallCount() { - synchronized (mLock) { - return mCallCount; - } - } - - public void waitForCount(int count, long timeoutMillis) throws TimeoutException { - synchronized (mLock) { - final long startTimeMillis = SystemClock.uptimeMillis(); - while (mCallCount < count) { - try { - final long elapsedTimeMillis = SystemClock.uptimeMillis() - startTimeMillis; - final long remainingTimeMillis = timeoutMillis - elapsedTimeMillis; - if (remainingTimeMillis <= 0) { - throw new TimeoutException(); - } - mLock.wait(timeoutMillis); - } catch (InterruptedException ie) { - /* ignore */ - } - } - } - } - } -} diff --git a/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java b/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java index 45e3f679fe55..5d12f7e43558 100644 --- a/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java +++ b/core/tests/coretests/src/android/print/IPrintManagerParametersTest.java @@ -16,6 +16,8 @@ package android.print; +import static android.print.test.Utils.assertException; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -33,10 +35,11 @@ import android.os.UserHandle; import android.print.PrintAttributes.Margins; import android.print.PrintAttributes.MediaSize; import android.print.PrintAttributes.Resolution; -import android.print.mockservice.MockPrintService; -import android.print.mockservice.PrintServiceCallbacks; -import android.print.mockservice.PrinterDiscoverySessionCallbacks; -import android.print.mockservice.StubbablePrinterDiscoverySession; +import android.print.test.BasePrintTest; +import android.print.test.services.FirstPrintService; +import android.print.test.services.PrintServiceCallbacks; +import android.print.test.services.PrinterDiscoverySessionCallbacks; +import android.print.test.services.StubbablePrinterDiscoverySession; import android.printservice.recommendation.IRecommendationsChangeListener; import android.support.test.filters.LargeTest; import android.support.test.filters.MediumTest; @@ -149,7 +152,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { session.addPrinters(printers); } - onPrinterDiscoverySessionStartCalled(); + onPrinterDiscoverySessionCreateCalled(); return null; }, null, null, null, null, null, null), null, null); @@ -200,13 +203,18 @@ public class IPrintManagerParametersTest extends BasePrintTest { } private void startPrinting() { - mGoodPrintJob = print(createMockAdapter(), null); + mGoodPrintJob = print(createMockAdapter(), (PrintAttributes) null); // Wait for PrintActivity to be ready - waitForStartAdapterCallbackCalled(); + waitForAdapterStartCallbackCalled(); // Wait for printer discovery session to be ready - waitForPrinterDiscoverySessionStartCallbackCalled(); + waitForPrinterDiscoverySessionCreateCallbackCalled(); + } + + private void endPrinting() { + getUiDevice().pressBack(); + getUiDevice().pressBack(); } /** @@ -220,7 +228,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { @Before public void setUpMockService() throws Exception { - MockPrintService.setCallbacks(createMockCallbacks()); + FirstPrintService.setCallbacks(createMockCallbacks()); mIPrintManager = IPrintManager.Stub .asInterface(ServiceManager.getService(Context.PRINT_SERVICE)); @@ -231,7 +239,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testGetPrintJobInfo() throws Exception { + public void testGetPrintJobInfo() throws Throwable { startPrinting(); assertEquals(mGoodPrintJob.getId(), mIPrintManager.getPrintJobInfo(mGoodPrintJob.getId(), @@ -244,6 +252,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { SecurityException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -251,7 +261,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testGetPrintJobInfos() throws Exception { + public void testGetPrintJobInfos() throws Throwable { startPrinting(); List<PrintJobInfo> infos = mIPrintManager.getPrintJobInfos(mAppId, mUserId); @@ -269,6 +279,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { SecurityException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -276,7 +288,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testPrint() throws Exception { + public void testPrint() throws Throwable { final String name = "dummy print job"; final IPrintDocumentAdapter adapter = new PrintManager @@ -303,6 +315,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { getActivity().getPackageName(), BAD_APP_ID, mUserId), SecurityException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -310,7 +324,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testCancelPrintJob() throws Exception { + public void testCancelPrintJob() throws Throwable { startPrinting(); // Invalid print jobs IDs do not produce an exception @@ -325,6 +339,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { // Must be last as otherwise mGoodPrintJob will not be good anymore mIPrintManager.cancelPrintJob(mGoodPrintJob.getId(), mAppId, mUserId); + + endPrinting(); } /** @@ -332,7 +348,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testRestartPrintJob() throws Exception { + public void testRestartPrintJob() throws Throwable { startPrinting(); mIPrintManager.restartPrintJob(mGoodPrintJob.getId(), mAppId, mUserId); @@ -346,6 +362,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { SecurityException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -353,7 +371,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testAddPrintJobStateChangeListener() throws Exception { + @NoActivity + public void testAddPrintJobStateChangeListener() throws Throwable { final IPrintJobStateChangeListener listener = createMockIPrintJobStateChangeListener(); mIPrintManager.addPrintJobStateChangeListener(listener, mAppId, mUserId); @@ -373,7 +392,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testRemovePrintJobStateChangeListener() throws Exception { + @NoActivity + public void testRemovePrintJobStateChangeListener() throws Throwable { final IPrintJobStateChangeListener listener = createMockIPrintJobStateChangeListener(); mIPrintManager.addPrintJobStateChangeListener(listener, mAppId, mUserId); @@ -394,7 +414,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testAddPrintServicesChangeListener() throws Exception { + @NoActivity + public void testAddPrintServicesChangeListener() throws Throwable { final IPrintServicesChangeListener listener = createMockIPrintServicesChangeListener(); assertException(() -> mIPrintManager.addPrintServicesChangeListener(listener, mUserId), @@ -411,7 +432,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testRemovePrintServicesChangeListener() throws Exception { + @NoActivity + public void testRemovePrintServicesChangeListener() throws Throwable { final IPrintServicesChangeListener listener = createMockIPrintServicesChangeListener(); assertException(() -> mIPrintManager.removePrintServicesChangeListener(listener, mUserId), @@ -426,7 +448,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testGetPrintServices() throws Exception { + @NoActivity + public void testGetPrintServices() throws Throwable { assertException(() -> mIPrintManager.getPrintServices(PrintManager.ALL_SERVICES, mUserId), SecurityException.class); @@ -444,7 +467,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testSetPrintServiceEnabled() throws Exception { + @NoActivity + public void testSetPrintServiceEnabled() throws Throwable { assertException( () -> mIPrintManager.setPrintServiceEnabled(new ComponentName("bad", "name"), true, mUserId), SecurityException.class); @@ -460,7 +484,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testAddPrintServiceRecommendationsChangeListener() throws Exception { + @NoActivity + public void testAddPrintServiceRecommendationsChangeListener() throws Throwable { final IRecommendationsChangeListener listener = createMockIPrintServiceRecommendationsChangeListener(); @@ -479,7 +504,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testRemovePrintServiceRecommendationsChangeListener() throws Exception { + @NoActivity + public void testRemovePrintServiceRecommendationsChangeListener() throws Throwable { final IRecommendationsChangeListener listener = createMockIPrintServiceRecommendationsChangeListener(); @@ -498,7 +524,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testGetPrintServiceRecommendations() throws Exception { + @NoActivity + public void testGetPrintServiceRecommendations() throws Throwable { assertException(() -> mIPrintManager.getPrintServiceRecommendations(mUserId), SecurityException.class); @@ -510,7 +537,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testCreatePrinterDiscoverySession() throws Exception { + @NoActivity + public void testCreatePrinterDiscoverySession() throws Throwable { final IPrinterDiscoveryObserver listener = createMockIPrinterDiscoveryObserver(); mIPrintManager.createPrinterDiscoverySession(listener, mUserId); @@ -533,7 +561,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testStartPrinterDiscovery() throws Exception { + public void testStartPrinterDiscovery() throws Throwable { startPrinting(); final IPrinterDiscoveryObserver listener = createMockIPrinterDiscoveryObserver(); @@ -562,6 +590,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { NullPointerException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -569,7 +599,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testStopPrinterDiscovery() throws Exception { + @NoActivity + public void testStopPrinterDiscovery() throws Throwable { final IPrinterDiscoveryObserver listener = createMockIPrinterDiscoveryObserver(); mIPrintManager.startPrinterDiscovery(listener, null, mUserId); @@ -590,7 +621,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testValidatePrinters() throws Exception { + public void testValidatePrinters() throws Throwable { startPrinting(); final List<PrinterId> goodPrinters = new ArrayList<>(); @@ -617,6 +648,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { NullPointerException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -624,7 +657,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testStartPrinterStateTracking() throws Exception { + public void testStartPrinterStateTracking() throws Throwable { startPrinting(); mIPrintManager.startPrinterStateTracking(mGoodPrinterId, mUserId); @@ -636,6 +669,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { NullPointerException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -643,7 +678,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testGetCustomPrinterIcon() throws Exception { + public void testGetCustomPrinterIcon() throws Throwable { startPrinting(); mIPrintManager.getCustomPrinterIcon(mGoodPrinterId, mUserId); @@ -655,6 +690,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { NullPointerException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -662,7 +699,7 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @LargeTest @Test - public void testStopPrinterStateTracking() throws Exception { + public void testStopPrinterStateTracking() throws Throwable { startPrinting(); mIPrintManager.startPrinterStateTracking(mGoodPrinterId, mUserId); @@ -679,6 +716,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { NullPointerException.class); // Cannot test bad user Id as these tests are allowed to call across users + + endPrinting(); } /** @@ -686,7 +725,8 @@ public class IPrintManagerParametersTest extends BasePrintTest { */ @MediumTest @Test - public void testDestroyPrinterDiscoverySession() throws Exception { + @NoActivity + public void testDestroyPrinterDiscoverySession() throws Throwable { final IPrinterDiscoveryObserver listener = createMockIPrinterDiscoveryObserver(); mIPrintManager.createPrinterDiscoverySession(listener, mUserId); diff --git a/core/tests/coretests/src/android/print/mockservice/MockPrintService.java b/core/tests/coretests/src/android/print/mockservice/MockPrintService.java deleted file mode 100644 index 9c11c22282d7..000000000000 --- a/core/tests/coretests/src/android/print/mockservice/MockPrintService.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.print.mockservice; - -public class MockPrintService extends StubbablePrintService { - - private static final Object sLock = new Object(); - - private static PrintServiceCallbacks sCallbacks; - - public static void setCallbacks(PrintServiceCallbacks callbacks) { - synchronized (sLock) { - sCallbacks = callbacks; - } - } - - @Override - protected PrintServiceCallbacks getCallbacks() { - synchronized (sLock) { - if (sCallbacks != null) { - sCallbacks.setService(this); - } - return sCallbacks; - } - } -} diff --git a/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java b/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java deleted file mode 100644 index be002e29ff68..000000000000 --- a/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.print.mockservice; - -import android.os.CancellationSignal; -import android.print.PrinterId; -import android.printservice.CustomPrinterIconCallback; - -import java.util.List; - -public abstract class PrinterDiscoverySessionCallbacks { - - private StubbablePrinterDiscoverySession mSession; - - public void setSession(StubbablePrinterDiscoverySession session) { - mSession = session; - } - - public StubbablePrinterDiscoverySession getSession() { - return mSession; - } - - public abstract void onStartPrinterDiscovery(List<PrinterId> priorityList); - - public abstract void onStopPrinterDiscovery(); - - public abstract void onValidatePrinters(List<PrinterId> printerIds); - - public abstract void onStartPrinterStateTracking(PrinterId printerId); - - public abstract void onRequestCustomPrinterIcon(PrinterId printerId, - CancellationSignal cancellationSignal, CustomPrinterIconCallback callback); - - public abstract void onStopPrinterStateTracking(PrinterId printerId); - - public abstract void onDestroy(); -} diff --git a/core/tests/coretests/src/android/print/mockservice/StubbablePrintService.java b/core/tests/coretests/src/android/print/mockservice/StubbablePrintService.java deleted file mode 100644 index b58b27350c28..000000000000 --- a/core/tests/coretests/src/android/print/mockservice/StubbablePrintService.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.print.mockservice; - -import android.printservice.PrintJob; -import android.printservice.PrintService; -import android.printservice.PrinterDiscoverySession; - -public abstract class StubbablePrintService extends PrintService { - - @Override - public PrinterDiscoverySession onCreatePrinterDiscoverySession() { - PrintServiceCallbacks callbacks = getCallbacks(); - if (callbacks != null) { - return new StubbablePrinterDiscoverySession(this, - getCallbacks().onCreatePrinterDiscoverySessionCallbacks()); - } - return null; - } - - @Override - public void onRequestCancelPrintJob(PrintJob printJob) { - PrintServiceCallbacks callbacks = getCallbacks(); - if (callbacks != null) { - callbacks.onRequestCancelPrintJob(printJob); - } - } - - @Override - public void onPrintJobQueued(PrintJob printJob) { - PrintServiceCallbacks callbacks = getCallbacks(); - if (callbacks != null) { - callbacks.onPrintJobQueued(printJob); - } - } - - protected abstract PrintServiceCallbacks getCallbacks(); -} diff --git a/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java b/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java deleted file mode 100644 index f3a5373722cc..000000000000 --- a/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.print.mockservice; - -import android.support.annotation.NonNull; -import android.os.CancellationSignal; -import android.print.PrinterId; -import android.printservice.CustomPrinterIconCallback; -import android.printservice.PrintService; -import android.printservice.PrinterDiscoverySession; - -import java.util.List; - -public class StubbablePrinterDiscoverySession extends PrinterDiscoverySession { - private final PrintService mService; - private final PrinterDiscoverySessionCallbacks mCallbacks; - - public StubbablePrinterDiscoverySession(PrintService service, - PrinterDiscoverySessionCallbacks callbacks) { - mService = service; - mCallbacks = callbacks; - if (mCallbacks != null) { - mCallbacks.setSession(this); - } - } - - public PrintService getService() { - return mService; - } - - @Override - public void onStartPrinterDiscovery(@NonNull List<PrinterId> priorityList) { - if (mCallbacks != null) { - mCallbacks.onStartPrinterDiscovery(priorityList); - } - } - - @Override - public void onStopPrinterDiscovery() { - if (mCallbacks != null) { - mCallbacks.onStopPrinterDiscovery(); - } - } - - @Override - public void onValidatePrinters(@NonNull List<PrinterId> printerIds) { - if (mCallbacks != null) { - mCallbacks.onValidatePrinters(printerIds); - } - } - - @Override - public void onStartPrinterStateTracking(@NonNull PrinterId printerId) { - if (mCallbacks != null) { - mCallbacks.onStartPrinterStateTracking(printerId); - } - } - - @Override - public void onRequestCustomPrinterIcon(@NonNull PrinterId printerId, - @NonNull CancellationSignal cancellationSignal, - @NonNull CustomPrinterIconCallback callback) { - if (mCallbacks != null) { - mCallbacks.onRequestCustomPrinterIcon(printerId, cancellationSignal, callback); - } - } - - @Override - public void onStopPrinterStateTracking(@NonNull PrinterId printerId) { - if (mCallbacks != null) { - mCallbacks.onStopPrinterStateTracking(printerId); - } - } - - @Override - public void onDestroy() { - if (mCallbacks != null) { - mCallbacks.onDestroy(); - } - } -} diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java index 461d537e86f9..4e8322183a8b 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java @@ -214,7 +214,7 @@ public class BatteryStatsNoteTest extends TestCase{ assertTrue(bi.getOnBatteryScreenOffTimeBase().isRunning()); } - /** Test BatteryStatsImpl.noteScreenStateLocked. */ + /** Test BatteryStatsImpl.noteScreenStateLocked sets timebases and screen states correctly. */ @SmallTest public void testNoteScreenStateLocked() throws Exception { final MockClocks clocks = new MockClocks(); // holds realtime and uptime in ms @@ -233,4 +233,52 @@ public class BatteryStatsNoteTest extends TestCase{ assertEquals(bi.getScreenState(), Display.STATE_OFF); } + /** Test BatteryStatsImpl.noteScreenStateLocked updates timers correctly. + * + * Unknown and doze should both be subset of off state + * + * Timeline 0----100----200----310----400------------1000 + * Unknown ------- + * On ------- + * Off ------- ---------------------- + * Doze ---------------- + */ + @SmallTest + public void testNoteScreenStateTimersLocked() throws Exception { + final MockClocks clocks = new MockClocks(); // holds realtime and uptime in ms + MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); + + clocks.realtime = clocks.uptime = 100; + // Device startup, setOnBatteryLocked calls updateTimebases + bi.updateTimeBasesLocked(true, Display.STATE_UNKNOWN, 100_000, 100_000); + // Turn on display at 200us + clocks.realtime = clocks.uptime = 200; + bi.noteScreenStateLocked(Display.STATE_ON); + assertEquals(150_000, bi.computeBatteryRealtime(250_000, STATS_SINCE_CHARGED)); + assertEquals(100_000, bi.computeBatteryScreenOffRealtime(250_000, STATS_SINCE_CHARGED)); + assertEquals(50_000, bi.getScreenOnTime(250_000, STATS_SINCE_CHARGED)); + assertEquals(0, bi.getScreenDozeTime(250_000, STATS_SINCE_CHARGED)); + + clocks.realtime = clocks.uptime = 310; + bi.noteScreenStateLocked(Display.STATE_OFF); + assertEquals(250_000, bi.computeBatteryRealtime(350_000, STATS_SINCE_CHARGED)); + assertEquals(140_000, bi.computeBatteryScreenOffRealtime(350_000, STATS_SINCE_CHARGED)); + assertEquals(110_000, bi.getScreenOnTime(350_000, STATS_SINCE_CHARGED)); + assertEquals(0, bi.getScreenDozeTime(350_000, STATS_SINCE_CHARGED)); + + clocks.realtime = clocks.uptime = 400; + bi.noteScreenStateLocked(Display.STATE_DOZE); + assertEquals(400_000, bi.computeBatteryRealtime(500_000, STATS_SINCE_CHARGED)); + assertEquals(290_000, bi.computeBatteryScreenOffRealtime(500_000, STATS_SINCE_CHARGED)); + assertEquals(110_000, bi.getScreenOnTime(500_000, STATS_SINCE_CHARGED)); + assertEquals(100_000, bi.getScreenDozeTime(500_000, STATS_SINCE_CHARGED)); + + clocks.realtime = clocks.uptime = 1000; + bi.noteScreenStateLocked(Display.STATE_OFF); + assertEquals(1400_000, bi.computeBatteryRealtime(1500_000, STATS_SINCE_CHARGED)); + assertEquals(1290_000, bi.computeBatteryScreenOffRealtime(1500_000, STATS_SINCE_CHARGED)); + assertEquals(110_000, bi.getScreenOnTime(1500_000, STATS_SINCE_CHARGED)); + assertEquals(600_000, bi.getScreenDozeTime(1500_000, STATS_SINCE_CHARGED)); + } + } diff --git a/libs/protoutil/Android.mk b/libs/protoutil/Android.mk index a5348169513f..2a2b087dc032 100644 --- a/libs/protoutil/Android.mk +++ b/libs/protoutil/Android.mk @@ -22,15 +22,15 @@ LOCAL_CFLAGS := \ -Wall -Werror -Wno-missing-field-initializers -Wno-unused-variable -Wunused-parameter LOCAL_SHARED_LIBRARIES := \ - libbinder \ + libcutils \ liblog \ - libutils LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include LOCAL_SRC_FILES := \ src/EncodedBuffer.cpp \ + src/ProtoOutputStream.cpp \ src/protobuf.cpp \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include diff --git a/libs/protoutil/include/android/util/EncodedBuffer.h b/libs/protoutil/include/android/util/EncodedBuffer.h index cf096091c055..e568e4cf02fc 100644 --- a/libs/protoutil/include/android/util/EncodedBuffer.h +++ b/libs/protoutil/include/android/util/EncodedBuffer.h @@ -52,10 +52,10 @@ public: size_t index() const; size_t offset() const; - void move(size_t amt); - inline void move() { move(1); }; + Pointer* move(size_t amt); + inline Pointer* move() { return move(1); }; + Pointer* rewind(); - void rewind(); Pointer copy() const; private: @@ -88,15 +88,71 @@ public: size_t currentToWrite(); /** - * Write a varint into a vector. Return the size of the varint. + * Write a single byte to the buffer. */ - size_t writeRawVarint(uint32_t val); + void writeRawByte(uint8_t val); + + /** + * Write a varint32 into the buffer. Return the size of the varint. + */ + size_t writeRawVarint32(uint32_t val); + + /** + * Write a varint64 into the buffer. Return the size of the varint. + */ + size_t writeRawVarint64(uint64_t val); + + /** + * Write Fixed32 into the buffer. + */ + void writeRawFixed32(uint32_t val); + + /** + * Write Fixed64 into the buffer. + */ + void writeRawFixed64(uint64_t val); /** * Write a protobuf header. Return the size of the header. */ size_t writeHeader(uint32_t fieldId, uint8_t wireType); + /********************************* Edit APIs ************************************************/ + /** + * Returns the edit pointer. + */ + Pointer* ep(); + + /** + * Read a single byte at ep, and move ep to next byte; + */ + uint8_t readRawByte(); + + /** + * Read varint starting at ep, ep will move to pos of next byte. + */ + uint64_t readRawVarint(); + + /** + * Read 4 bytes starting at ep, ep will move to pos of next byte. + */ + uint32_t readRawFixed32(); + + /** + * Read 8 bytes starting at ep, ep will move to pos of next byte. + */ + uint64_t readRawFixed64(); + + /** + * Edit 4 bytes starting at pos. + */ + void editRawFixed32(size_t pos, uint32_t val); + + /** + * Copy _size_ bytes of data starting at __srcPos__ to wp. + */ + void copy(size_t srcPos, size_t size); + /********************************* Read APIs ************************************************/ class iterator; friend class iterator; @@ -141,9 +197,8 @@ public: /** * Read varint from iterator, the iterator will point to next available byte. - * Return the number of bytes of the varint. */ - uint32_t readRawVarint(); + uint64_t readRawVarint(); private: const EncodedBuffer& mData; @@ -160,6 +215,7 @@ private: vector<uint8_t*> mBuffers; Pointer mWp; + Pointer mEp; inline uint8_t* at(const Pointer& p) const; // helper function to get value }; @@ -167,4 +223,5 @@ private: } // util } // android -#endif // ANDROID_UTIL_ENCODED_BUFFER_H
\ No newline at end of file +#endif // ANDROID_UTIL_ENCODED_BUFFER_H + diff --git a/libs/protoutil/include/android/util/ProtoOutputStream.h b/libs/protoutil/include/android/util/ProtoOutputStream.h new file mode 100644 index 000000000000..49ec169b3e5c --- /dev/null +++ b/libs/protoutil/include/android/util/ProtoOutputStream.h @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ANDROID_UTIL_PROTOOUTPUT_STREAM_H +#define ANDROID_UTIL_PROTOOUTPUT_STREAM_H + +#include <android/util/EncodedBuffer.h> + +#include <stdint.h> +#include <string> + +namespace android { +namespace util { + +/** + * Class to write to a protobuf stream. + * + * Each write method takes an ID code from the protoc generated classes + * and the value to write. To make a nested object, call start + * and then end when you are done. + * + * See the java version implementation (ProtoOutputStream.java) for more infos. + */ +class ProtoOutputStream +{ +public: + ProtoOutputStream(int fd); + ~ProtoOutputStream(); + + /** + * Write APIs for dumping protobuf data. Returns true if the write succeeds. + */ + bool write(uint64_t fieldId, double val); + bool write(uint64_t fieldId, float val); + bool write(uint64_t fieldId, int val); + bool write(uint64_t fieldId, long long val); + bool write(uint64_t fieldId, bool val); + bool write(uint64_t fieldId, std::string val); + bool write(uint64_t fieldId, const char* val); + + /** + * Starts a sub-message write session. + * Returns a token of this write session. + * Must call end(token) when finish write this sub-message. + */ + long long start(uint64_t fieldId); + void end(long long token); + + /** + * Flushes the protobuf data out. + */ + bool flush(); + +private: + EncodedBuffer mBuffer; + int mFd; + size_t mCopyBegin; + bool mCompact; + int mDepth; + int mObjectId; + long long mExpectedObjectToken; + + inline void writeDoubleImpl(uint32_t id, double val); + inline void writeFloatImpl(uint32_t id, float val); + inline void writeInt64Impl(uint32_t id, long long val); + inline void writeInt32Impl(uint32_t id, int val); + inline void writeUint64Impl(uint32_t id, uint64_t val); + inline void writeUint32Impl(uint32_t id, uint32_t val); + inline void writeFixed64Impl(uint32_t id, uint64_t val); + inline void writeFixed32Impl(uint32_t id, uint32_t val); + inline void writeSFixed64Impl(uint32_t id, long long val); + inline void writeSFixed32Impl(uint32_t id, int val); + inline void writeZigzagInt64Impl(uint32_t id, long long val); + inline void writeZigzagInt32Impl(uint32_t id, int val); + inline void writeEnumImpl(uint32_t id, int val); + inline void writeBoolImpl(uint32_t id, bool val); + inline void writeUtf8StringImpl(uint32_t id, const char* val, size_t size); + + bool compact(); + size_t editEncodedSize(size_t rawSize); + bool compactSize(size_t rawSize); +}; + +} +} + +#endif // ANDROID_UTIL_PROTOOUTPUT_STREAM_H
\ No newline at end of file diff --git a/libs/protoutil/include/android/util/protobuf.h b/libs/protoutil/include/android/util/protobuf.h index f4e8d092ba52..ca45e263b20e 100644 --- a/libs/protoutil/include/android/util/protobuf.h +++ b/libs/protoutil/include/android/util/protobuf.h @@ -24,6 +24,9 @@ namespace util { using namespace std; +const int FIELD_ID_SHIFT = 3; +const uint8_t WIRE_TYPE_MASK = (1 << FIELD_ID_SHIFT) - 1; + const uint8_t WIRE_TYPE_VARINT = 0; const uint8_t WIRE_TYPE_FIXED64 = 1; const uint8_t WIRE_TYPE_LENGTH_DELIMITED = 2; @@ -35,16 +38,20 @@ const uint8_t WIRE_TYPE_FIXED32 = 5; uint8_t read_wire_type(uint32_t varint); /** - * read field id from varint, it is varint >> 3; + * Read field id from varint, it is varint >> 3; */ uint32_t read_field_id(uint32_t varint); /** + * Get the size of a varint. + */ +size_t get_varint_size(uint64_t varint); + +/** * Write a varint into the buffer. Return the next position to write at. - * There must be 10 bytes in the buffer. The same as - * EncodedBuffer.writeRawVarint32 + * There must be 10 bytes in the buffer. */ -uint8_t* write_raw_varint(uint8_t* buf, uint32_t val); +uint8_t* write_raw_varint(uint8_t* buf, uint64_t val); /** * Write a protobuf WIRE_TYPE_LENGTH_DELIMITED header. Return the next position diff --git a/libs/protoutil/src/EncodedBuffer.cpp b/libs/protoutil/src/EncodedBuffer.cpp index 84dc5b6d7852..435ae8836217 100644 --- a/libs/protoutil/src/EncodedBuffer.cpp +++ b/libs/protoutil/src/EncodedBuffer.cpp @@ -15,6 +15,7 @@ */ #include <android/util/EncodedBuffer.h> +#include <android/util/protobuf.h> #include <stdlib.h> @@ -52,19 +53,21 @@ EncodedBuffer::Pointer::offset() const return mOffset; } -void +EncodedBuffer::Pointer* EncodedBuffer::Pointer::move(size_t amt) { size_t newOffset = mOffset + amt; mIndex += newOffset / mChunkSize; mOffset = newOffset % mChunkSize; + return this; } -void +EncodedBuffer::Pointer* EncodedBuffer::Pointer::rewind() { mIndex = 0; mOffset = 0; + return this; } EncodedBuffer::Pointer @@ -86,6 +89,7 @@ EncodedBuffer::EncodedBuffer(size_t chunkSize) { mChunkSize = chunkSize == 0 ? BUFFER_SIZE : chunkSize; mWp = Pointer(mChunkSize); + mEp = Pointer(mChunkSize); } EncodedBuffer::~EncodedBuffer() @@ -137,28 +141,136 @@ EncodedBuffer::currentToWrite() return mChunkSize - mWp.offset(); } +void +EncodedBuffer::writeRawByte(uint8_t val) +{ + *writeBuffer() = val; + mWp.move(); +} + size_t -EncodedBuffer::writeRawVarint(uint32_t val) +EncodedBuffer::writeRawVarint64(uint64_t val) { size_t size = 0; while (true) { size++; if ((val & ~0x7F) == 0) { - *writeBuffer() = (uint8_t) val; - mWp.move(); + writeRawByte((uint8_t) val); return size; } else { - *writeBuffer() = (uint8_t)((val & 0x7F) | 0x80); - mWp.move(); + writeRawByte((uint8_t)((val & 0x7F) | 0x80)); val >>= 7; } } } size_t +EncodedBuffer::writeRawVarint32(uint32_t val) +{ + uint64_t v =(uint64_t)val; + return writeRawVarint64(v); +} + +void +EncodedBuffer::writeRawFixed32(uint32_t val) +{ + writeRawByte((uint8_t) val); + writeRawByte((uint8_t) (val>>8)); + writeRawByte((uint8_t) (val>>16)); + writeRawByte((uint8_t) (val>>24)); +} + +void +EncodedBuffer::writeRawFixed64(uint64_t val) +{ + writeRawByte((uint8_t) val); + writeRawByte((uint8_t) (val>>8)); + writeRawByte((uint8_t) (val>>16)); + writeRawByte((uint8_t) (val>>24)); + writeRawByte((uint8_t) (val>>32)); + writeRawByte((uint8_t) (val>>40)); + writeRawByte((uint8_t) (val>>48)); + writeRawByte((uint8_t) (val>>56)); +} + +size_t EncodedBuffer::writeHeader(uint32_t fieldId, uint8_t wireType) { - return writeRawVarint((fieldId << 3) | wireType); + return writeRawVarint32((fieldId << FIELD_ID_SHIFT) | wireType); +} + +/******************************** Edit APIs ************************************************/ +EncodedBuffer::Pointer* +EncodedBuffer::ep() +{ + return &mEp; +} + +uint8_t +EncodedBuffer::readRawByte() +{ + uint8_t val = *at(mEp); + mEp.move(); + return val; +} + +uint64_t +EncodedBuffer::readRawVarint() +{ + uint64_t val = 0, shift = 0; + size_t start = mEp.pos(); + while (true) { + uint8_t byte = readRawByte(); + val += (byte & 0x7F) << shift; + if ((byte & 0x80) == 0) break; + shift += 7; + } + return val; +} + +uint32_t +EncodedBuffer::readRawFixed32() +{ + uint32_t val = 0; + for (auto i=0; i<32; i+=8) { + val += (uint32_t)readRawByte() << i; + } + return val; +} + +uint64_t +EncodedBuffer::readRawFixed64() +{ + uint64_t val = 0; + for (auto i=0; i<64; i+=8) { + val += (uint64_t)readRawByte() << i; + } + return val; +} + +void +EncodedBuffer::editRawFixed32(size_t pos, uint32_t val) +{ + size_t oldPos = mEp.pos(); + mEp.rewind()->move(pos); + for (auto i=0; i<32; i+=8) { + *at(mEp) = (uint8_t) (val >> i); + mEp.move(); + } + mEp.rewind()->move(oldPos); +} + +void +EncodedBuffer::copy(size_t srcPos, size_t size) +{ + if (size == 0) return; + Pointer cp(mChunkSize); + cp.move(srcPos); + + while (cp.pos() < srcPos + size) { + writeRawByte(*at(cp)); + cp.move(); + } } /********************************* Read APIs ************************************************/ @@ -220,10 +332,10 @@ EncodedBuffer::iterator::next() return res; } -uint32_t +uint64_t EncodedBuffer::iterator::readRawVarint() { - uint32_t val = 0, shift = 0; + uint64_t val = 0, shift = 0; while (true) { uint8_t byte = next(); val += (byte & 0x7F) << shift; diff --git a/libs/protoutil/src/ProtoOutputStream.cpp b/libs/protoutil/src/ProtoOutputStream.cpp new file mode 100644 index 000000000000..e9ca0dcb1093 --- /dev/null +++ b/libs/protoutil/src/ProtoOutputStream.cpp @@ -0,0 +1,652 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#define LOG_TAG "libprotoutil" + +#include <android/util/protobuf.h> +#include <android/util/ProtoOutputStream.h> +#include <cutils/log.h> +#include <cstring> + +namespace android { +namespace util { + +/** + * Position of the field type in a (long long) fieldId. + */ +const uint64_t FIELD_TYPE_SHIFT = 32; + +/** + * Mask for the field types stored in a fieldId. Leaves a whole + * byte for future expansion, even though there are currently only 17 types. + */ +const uint64_t FIELD_TYPE_MASK = 0x0ffULL << FIELD_TYPE_SHIFT; + +const uint64_t FIELD_TYPE_UNKNOWN = 0; +const uint64_t TYPE_DOUBLE = 1ULL << FIELD_TYPE_SHIFT; // double, exactly eight bytes on the wire. +const uint64_t TYPE_FLOAT = 2ULL << FIELD_TYPE_SHIFT; // float, exactly four bytes on the wire. +const uint64_t TYPE_INT64 = 3ULL << FIELD_TYPE_SHIFT; // int64, varint on the wire. Negative numbers + // take 10 bytes. Use TYPE_SINT64 if negative + // values are likely. +const uint64_t TYPE_UINT64 = 4ULL << FIELD_TYPE_SHIFT; // uint64, varint on the wire. +const uint64_t TYPE_INT32 = 5ULL << FIELD_TYPE_SHIFT; // int32, varint on the wire. Negative numbers + // take 10 bytes. Use TYPE_SINT32 if negative + // values are likely. +const uint64_t TYPE_FIXED64 = 6ULL << FIELD_TYPE_SHIFT; // uint64, exactly eight bytes on the wire. +const uint64_t TYPE_FIXED32 = 7ULL << FIELD_TYPE_SHIFT; // uint32, exactly four bytes on the wire. +const uint64_t TYPE_BOOL = 8ULL << FIELD_TYPE_SHIFT; // bool, varint on the wire. +const uint64_t TYPE_STRING = 9ULL << FIELD_TYPE_SHIFT; // UTF-8 text. +const uint64_t TYPE_GROUP = 10ULL << FIELD_TYPE_SHIFT; // Tag-delimited message. Deprecated. +const uint64_t TYPE_MESSAGE = 11ULL << FIELD_TYPE_SHIFT; // Length-delimited message. + +const uint64_t TYPE_BYTES = 12ULL << FIELD_TYPE_SHIFT; // Arbitrary byte array. +const uint64_t TYPE_UINT32 = 13ULL << FIELD_TYPE_SHIFT; // uint32, varint on the wire +const uint64_t TYPE_ENUM = 14ULL << FIELD_TYPE_SHIFT; // Enum, varint on the wire +const uint64_t TYPE_SFIXED32 = 15ULL << FIELD_TYPE_SHIFT; // int32, exactly four bytes on the wire +const uint64_t TYPE_SFIXED64 = 16ULL << FIELD_TYPE_SHIFT; // int64, exactly eight bytes on the wire +const uint64_t TYPE_SINT32 = 17ULL << FIELD_TYPE_SHIFT; // int32, ZigZag-encoded varint on the wire +const uint64_t TYPE_SINT64 = 18ULL << FIELD_TYPE_SHIFT; // int64, ZigZag-encoded varint on the wire + +// +// FieldId flags for whether the field is single, repeated or packed. +// TODO: packed is not supported yet. +// +const uint64_t FIELD_COUNT_SHIFT = 40; +const uint64_t FIELD_COUNT_MASK = 0x0fULL << FIELD_COUNT_SHIFT; +const uint64_t FIELD_COUNT_UNKNOWN = 0; +const uint64_t FIELD_COUNT_SINGLE = 1ULL << FIELD_COUNT_SHIFT; +const uint64_t FIELD_COUNT_REPEATED = 2ULL << FIELD_COUNT_SHIFT; +const uint64_t FIELD_COUNT_PACKED = 4ULL << FIELD_COUNT_SHIFT; + +ProtoOutputStream::ProtoOutputStream(int fd) + :mBuffer(), + mFd(fd), + mCopyBegin(0), + mCompact(false), + mDepth(0), + mObjectId(0), + mExpectedObjectToken(0LL) +{ +} + +ProtoOutputStream::~ProtoOutputStream() +{ +} + +bool +ProtoOutputStream::write(uint64_t fieldId, double val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_DOUBLE: writeDoubleImpl(id, (double)val); break; + case TYPE_FLOAT: writeFloatImpl(id, (float)val); break; + case TYPE_INT64: writeInt64Impl(id, (long long)val); break; + case TYPE_UINT64: writeUint64Impl(id, (uint64_t)val); break; + case TYPE_INT32: writeInt32Impl(id, (int)val); break; + case TYPE_FIXED64: writeFixed64Impl(id, (uint64_t)val); break; + case TYPE_FIXED32: writeFixed32Impl(id, (uint32_t)val); break; + case TYPE_UINT32: writeUint32Impl(id, (uint32_t)val); break; + case TYPE_SFIXED32: writeSFixed32Impl(id, (int)val); break; + case TYPE_SFIXED64: writeSFixed64Impl(id, (long long)val); break; + case TYPE_SINT32: writeZigzagInt32Impl(id, (int)val); break; + case TYPE_SINT64: writeZigzagInt64Impl(id, (long long)val); break; + default: + ALOGW("Field type %d is not supported when writing double val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } + return true; +} + +bool +ProtoOutputStream::write(uint64_t fieldId, float val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_DOUBLE: writeDoubleImpl(id, (double)val); break; + case TYPE_FLOAT: writeFloatImpl(id, (float)val); break; + case TYPE_INT64: writeInt64Impl(id, (long long)val); break; + case TYPE_UINT64: writeUint64Impl(id, (uint64_t)val); break; + case TYPE_INT32: writeInt32Impl(id, (int)val); break; + case TYPE_FIXED64: writeFixed64Impl(id, (uint64_t)val); break; + case TYPE_FIXED32: writeFixed32Impl(id, (uint32_t)val); break; + case TYPE_UINT32: writeUint32Impl(id, (uint32_t)val); break; + case TYPE_SFIXED32: writeSFixed32Impl(id, (int)val); break; + case TYPE_SFIXED64: writeSFixed64Impl(id, (long long)val); break; + case TYPE_SINT32: writeZigzagInt32Impl(id, (int)val); break; + case TYPE_SINT64: writeZigzagInt64Impl(id, (long long)val); break; + default: + ALOGW("Field type %d is not supported when writing float val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } + return true; +} + +bool +ProtoOutputStream::write(uint64_t fieldId, int val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_DOUBLE: writeDoubleImpl(id, (double)val); break; + case TYPE_FLOAT: writeFloatImpl(id, (float)val); break; + case TYPE_INT64: writeInt64Impl(id, (long long)val); break; + case TYPE_UINT64: writeUint64Impl(id, (uint64_t)val); break; + case TYPE_INT32: writeInt32Impl(id, (int)val); break; + case TYPE_FIXED64: writeFixed64Impl(id, (uint64_t)val); break; + case TYPE_FIXED32: writeFixed32Impl(id, (uint32_t)val); break; + case TYPE_UINT32: writeUint32Impl(id, (uint32_t)val); break; + case TYPE_SFIXED32: writeSFixed32Impl(id, (int)val); break; + case TYPE_SFIXED64: writeSFixed64Impl(id, (long long)val); break; + case TYPE_SINT32: writeZigzagInt32Impl(id, (int)val); break; + case TYPE_SINT64: writeZigzagInt64Impl(id, (long long)val); break; + case TYPE_ENUM: writeEnumImpl(id, (int)val); break; + case TYPE_BOOL: writeBoolImpl(id, val != 0); break; + default: + ALOGW("Field type %d is not supported when writing int val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } + return true; +} + +bool +ProtoOutputStream::write(uint64_t fieldId, long long val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_DOUBLE: writeDoubleImpl(id, (double)val); break; + case TYPE_FLOAT: writeFloatImpl(id, (float)val); break; + case TYPE_INT64: writeInt64Impl(id, (long long)val); break; + case TYPE_UINT64: writeUint64Impl(id, (uint64_t)val); break; + case TYPE_INT32: writeInt32Impl(id, (int)val); break; + case TYPE_FIXED64: writeFixed64Impl(id, (uint64_t)val); break; + case TYPE_FIXED32: writeFixed32Impl(id, (uint32_t)val); break; + case TYPE_UINT32: writeUint32Impl(id, (uint32_t)val); break; + case TYPE_SFIXED32: writeSFixed32Impl(id, (int)val); break; + case TYPE_SFIXED64: writeSFixed64Impl(id, (long long)val); break; + case TYPE_SINT32: writeZigzagInt32Impl(id, (int)val); break; + case TYPE_SINT64: writeZigzagInt64Impl(id, (long long)val); break; + case TYPE_ENUM: writeEnumImpl(id, (int)val); break; + case TYPE_BOOL: writeBoolImpl(id, val != 0); break; + default: + ALOGW("Field type %d is not supported when writing long long val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } + return true; +} + +bool +ProtoOutputStream::write(uint64_t fieldId, bool val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_BOOL: + writeBoolImpl(id, val); + return true; + default: + ALOGW("Field type %d is not supported when writing bool val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } +} + +bool +ProtoOutputStream::write(uint64_t fieldId, string val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_STRING: + writeUtf8StringImpl(id, val.c_str(), val.size()); + return true; + default: + ALOGW("Field type %d is not supported when writing string val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } +} + +bool +ProtoOutputStream::write(uint64_t fieldId, const char* val) +{ + if (mCompact) return false; + const uint32_t id = (uint32_t)fieldId; + int size = 0; + while (val[size] != '\0') size++; + switch (fieldId & FIELD_TYPE_MASK) { + case TYPE_STRING: + writeUtf8StringImpl(id, val, size); + return true; + default: + ALOGW("Field type %d is not supported when writing char[] val.", + (int)((fieldId & FIELD_TYPE_MASK) >> FIELD_TYPE_SHIFT)); + return false; + } +} + +/** + * Make a token. + * Bits 61-63 - tag size (So we can go backwards later if the object had not data) + * - 3 bits, max value 7, max value needed 5 + * Bit 60 - true if the object is repeated + * Bits 59-51 - depth (For error checking) + * - 9 bits, max value 512, when checking, value is masked (if we really + * are more than 512 levels deep) + * Bits 32-50 - objectId (For error checking) + * - 19 bits, max value 524,288. that's a lot of objects. IDs will wrap + * because of the overflow, and only the tokens are compared. + * Bits 0-31 - offset of the first size field in the buffer. + */ +long long +makeToken(int tagSize, bool repeated, int depth, int objectId, int sizePos) { + return ((0x07L & (long long)tagSize) << 61) + | (repeated ? (1LL << 60) : 0) + | (0x01ffL & (long long)depth) << 51 + | (0x07ffffL & (long long)objectId) << 32 + | (0x0ffffffffL & (long long)sizePos); +} + +/** + * Get the encoded tag size from the token. + */ +static int getTagSizeFromToken(long long token) { + return (int)(0x7 & (token >> 61)); +} + +/** + * Get the nesting depth of startObject calls from the token. + */ +static int getDepthFromToken(long long token) { + return (int)(0x01ff & (token >> 51)); +} + +/** + * Get the location of the childRawSize (the first 32 bit size field) in this object. + */ +static int getSizePosFromToken(long long token) { + return (int)token; +} + +long long +ProtoOutputStream::start(uint64_t fieldId) +{ + if ((fieldId & FIELD_TYPE_MASK) != TYPE_MESSAGE) { + ALOGE("Can't call start for non-message type field: 0x%llx", (long long)fieldId); + return 0; + } + + uint32_t id = (uint32_t)fieldId; + mBuffer.writeHeader(id, WIRE_TYPE_LENGTH_DELIMITED); + + size_t sizePos = mBuffer.wp()->pos(); + + mDepth++; + mObjectId++; + mBuffer.writeRawFixed64(mExpectedObjectToken); // push previous token into stack. + + mExpectedObjectToken = makeToken(get_varint_size(id), + (bool)(fieldId & FIELD_COUNT_REPEATED), mDepth, mObjectId, sizePos); + return mExpectedObjectToken; +} + +void +ProtoOutputStream::end(long long token) +{ + if (token != mExpectedObjectToken) { + ALOGE("Unexpected token: 0x%llx, should be 0x%llx", token, mExpectedObjectToken); + return; + } + + int depth = getDepthFromToken(token); + if (depth != (mDepth & 0x01ff)) { + ALOGE("Unexpected depth: %d, should be %d", depth, mDepth); + return; + } + mDepth--; + + int sizePos = getSizePosFromToken(token); + // number of bytes written in this start-end session. + int childRawSize = mBuffer.wp()->pos() - sizePos - 8; + + // retrieve the old token from stack. + mBuffer.ep()->rewind()->move(sizePos); + mExpectedObjectToken = mBuffer.readRawFixed64(); + + // If raw size is larger than 0, write the negative value here to indicate a compact is needed. + if (childRawSize > 0) { + mBuffer.editRawFixed32(sizePos, -childRawSize); + mBuffer.editRawFixed32(sizePos+4, -1); + } else { + // reset wp which erase the header tag of the message when its size is 0. + mBuffer.wp()->rewind()->move(sizePos - getTagSizeFromToken(token)); + } +} + +bool +ProtoOutputStream::compact() { + if (mCompact) return true; + if (mDepth != 0) { + ALOGE("Can't compact when depth(%d) is not zero. Missing calls to end.", mDepth); + return false; + } + // record the size of the original buffer. + size_t rawBufferSize = mBuffer.size(); + if (rawBufferSize == 0) return true; // nothing to do if the buffer is empty; + + // reset edit pointer and recursively compute encoded size of messages. + mBuffer.ep()->rewind(); + if (editEncodedSize(rawBufferSize) == 0) { + ALOGE("Failed to editEncodedSize."); + return false; + } + + // reset both edit pointer and write pointer, and compact recursively. + mBuffer.ep()->rewind(); + mBuffer.wp()->rewind(); + if (!compactSize(rawBufferSize)) { + ALOGE("Failed to compactSize."); + return false; + } + // copy the reset to the buffer. + if (mCopyBegin < rawBufferSize) { + mBuffer.copy(mCopyBegin, rawBufferSize - mCopyBegin); + } + + // mark true means it is not legal to write to this ProtoOutputStream anymore + mCompact = true; + return true; +} + +/** + * First compaction pass. Iterate through the data, and fill in the + * nested object sizes so the next pass can compact them. + */ +size_t +ProtoOutputStream::editEncodedSize(size_t rawSize) +{ + size_t objectStart = mBuffer.ep()->pos(); + size_t objectEnd = objectStart + rawSize; + size_t encodedSize = 0; + int childRawSize, childEncodedSize; + size_t childEncodedSizePos; + + while (mBuffer.ep()->pos() < objectEnd) { + uint32_t tag = (uint32_t)mBuffer.readRawVarint(); + encodedSize += get_varint_size(tag); + switch (read_wire_type(tag)) { + case WIRE_TYPE_VARINT: + do { + encodedSize++; + } while ((mBuffer.readRawByte() & 0x80) != 0); + break; + case WIRE_TYPE_FIXED64: + encodedSize += 8; + mBuffer.ep()->move(8); + break; + case WIRE_TYPE_LENGTH_DELIMITED: + childRawSize = (int)mBuffer.readRawFixed32(); + childEncodedSizePos = mBuffer.ep()->pos(); + childEncodedSize = (int)mBuffer.readRawFixed32(); + if (childRawSize >= 0 && childRawSize == childEncodedSize) { + mBuffer.ep()->move(childRawSize); + } else if (childRawSize < 0 && childEncodedSize == -1){ + childEncodedSize = editEncodedSize(-childRawSize); + mBuffer.editRawFixed32(childEncodedSizePos, childEncodedSize); + } else { + ALOGE("Bad raw or encoded values: raw=%d, encoded=%d at %zu", + childRawSize, childEncodedSize, childEncodedSizePos); + return 0; + } + encodedSize += get_varint_size(childEncodedSize) + childEncodedSize; + break; + case WIRE_TYPE_FIXED32: + encodedSize += 4; + mBuffer.ep()->move(4); + break; + default: + ALOGE("Unexpected wire type %d in editEncodedSize at [%zu, %zu]", + read_wire_type(tag), objectStart, objectEnd); + return 0; + } + } + return encodedSize; +} + +/** + * Second compaction pass. Iterate through the data, and copy the data + * forward in the buffer, converting the pairs of uint32s into a single + * unsigned varint of the size. + */ +bool +ProtoOutputStream::compactSize(size_t rawSize) +{ + size_t objectStart = mBuffer.ep()->pos(); + size_t objectEnd = objectStart + rawSize; + int childRawSize, childEncodedSize; + + while (mBuffer.ep()->pos() < objectEnd) { + uint32_t tag = (uint32_t)mBuffer.readRawVarint(); + switch (read_wire_type(tag)) { + case WIRE_TYPE_VARINT: + while ((mBuffer.readRawByte() & 0x80) != 0) {} + break; + case WIRE_TYPE_FIXED64: + mBuffer.ep()->move(8); + break; + case WIRE_TYPE_LENGTH_DELIMITED: + mBuffer.copy(mCopyBegin, mBuffer.ep()->pos() - mCopyBegin); + + childRawSize = (int)mBuffer.readRawFixed32(); + childEncodedSize = (int)mBuffer.readRawFixed32(); + mCopyBegin = mBuffer.ep()->pos(); + + // write encoded size to buffer. + mBuffer.writeRawVarint32(childEncodedSize); + if (childRawSize >= 0 && childRawSize == childEncodedSize) { + mBuffer.ep()->move(childEncodedSize); + } else if (childRawSize < 0){ + if (!compactSize(-childRawSize)) return false; + } else { + ALOGE("Bad raw or encoded values: raw=%d, encoded=%d", + childRawSize, childEncodedSize); + return false; + } + break; + case WIRE_TYPE_FIXED32: + mBuffer.ep()->move(4); + break; + default: + ALOGE("Unexpected wire type %d in compactSize at [%zu, %zu]", + read_wire_type(tag), objectStart, objectEnd); + return false; + } + } + return true; +} + +static bool write_all(int fd, uint8_t const* buf, size_t size) +{ + while (size > 0) { + ssize_t amt = ::write(fd, buf, size); + if (amt < 0) { + return false; + } + size -= amt; + buf += amt; + } + return true; +} + +bool +ProtoOutputStream::flush() +{ + if (mFd < 0) return false; + if (!compact()) return false; + + EncodedBuffer::iterator it = mBuffer.begin(); + while (it.readBuffer() != NULL) { + if (!write_all(mFd, it.readBuffer(), it.currentToRead())) return false; + it.rp()->move(it.currentToRead()); + } + return true; +} + + +// ========================================================================= +// Private functions + +/** + * bit_cast + */ +template <class From, class To> +inline To bit_cast(From const &from) { + To to; + memcpy(&to, &from, sizeof(to)); + return to; +} + +inline void +ProtoOutputStream::writeDoubleImpl(uint32_t id, double val) +{ + if (val == 0.0) return; + mBuffer.writeHeader(id, WIRE_TYPE_FIXED64); + mBuffer.writeRawFixed64(bit_cast<double, uint64_t>(val)); +} + +inline void +ProtoOutputStream::writeFloatImpl(uint32_t id, float val) +{ + if (val == 0.0) return; + mBuffer.writeHeader(id, WIRE_TYPE_FIXED32); + mBuffer.writeRawFixed32(bit_cast<float, uint32_t>(val)); +} + +inline void +ProtoOutputStream::writeInt64Impl(uint32_t id, long long val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint64((uint64_t)val); +} + +inline void +ProtoOutputStream::writeInt32Impl(uint32_t id, int val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint32((uint32_t)val); +} + +inline void +ProtoOutputStream::writeUint64Impl(uint32_t id, uint64_t val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint64(val); +} + +inline void +ProtoOutputStream::writeUint32Impl(uint32_t id, uint32_t val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint32(val); +} + +inline void +ProtoOutputStream::writeFixed64Impl(uint32_t id, uint64_t val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_FIXED64); + mBuffer.writeRawFixed64(val); +} + +inline void +ProtoOutputStream::writeFixed32Impl(uint32_t id, uint32_t val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_FIXED32); + mBuffer.writeRawFixed32(val); +} + +inline void +ProtoOutputStream::writeSFixed64Impl(uint32_t id, long long val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_FIXED64); + mBuffer.writeRawFixed64((uint64_t)val); +} + +inline void +ProtoOutputStream::writeSFixed32Impl(uint32_t id, int val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_FIXED32); + mBuffer.writeRawFixed32((uint32_t)val); +} + +inline void +ProtoOutputStream::writeZigzagInt64Impl(uint32_t id, long long val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint64((val << 1) ^ (val >> 63)); +} + +inline void +ProtoOutputStream::writeZigzagInt32Impl(uint32_t id, int val) +{ + if (val == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint32((val << 1) ^ (val >> 31)); +} + +inline void +ProtoOutputStream::writeEnumImpl(uint32_t id, int val) +{ + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint32((uint32_t) val); +} + +inline void +ProtoOutputStream::writeBoolImpl(uint32_t id, bool val) +{ + if (!val) return; + mBuffer.writeHeader(id, WIRE_TYPE_VARINT); + mBuffer.writeRawVarint32(val ? 1 : 0); +} + +inline void +ProtoOutputStream::writeUtf8StringImpl(uint32_t id, const char* val, size_t size) +{ + if (val == NULL || size == 0) return; + mBuffer.writeHeader(id, WIRE_TYPE_LENGTH_DELIMITED); + mBuffer.writeRawFixed32(size); + mBuffer.writeRawFixed32(size); + for (size_t i=0; i<size; i++) { + mBuffer.writeRawByte((uint8_t)val[i]); + } +} + +} // util +} // android + diff --git a/libs/protoutil/src/protobuf.cpp b/libs/protoutil/src/protobuf.cpp index ec5325c57bd1..1c7eef922895 100644 --- a/libs/protoutil/src/protobuf.cpp +++ b/libs/protoutil/src/protobuf.cpp @@ -22,17 +22,28 @@ namespace util { uint8_t read_wire_type(uint32_t varint) { - return (uint8_t) (varint & 0x07); + return (uint8_t) (varint & WIRE_TYPE_MASK); } uint32_t read_field_id(uint32_t varint) { - return varint >> 3; + return varint >> FIELD_ID_SHIFT; +} + +size_t +get_varint_size(uint64_t varint) +{ + size_t size = 1; + while ((varint & ~0x7F)) { + size++; + varint >>= 7; + } + return size; } uint8_t* -write_raw_varint(uint8_t* buf, uint32_t val) +write_raw_varint(uint8_t* buf, uint64_t val) { uint8_t* p = buf; while (true) { @@ -49,7 +60,7 @@ write_raw_varint(uint8_t* buf, uint32_t val) uint8_t* write_length_delimited_tag_header(uint8_t* buf, uint32_t fieldId, size_t size) { - buf = write_raw_varint(buf, (fieldId << 3) | 2); + buf = write_raw_varint(buf, (fieldId << FIELD_ID_SHIFT) | WIRE_TYPE_LENGTH_DELIMITED); buf = write_raw_varint(buf, size); return buf; } diff --git a/media/java/android/media/tv/ITvInputHardware.aidl b/media/java/android/media/tv/ITvInputHardware.aidl index 96223ba7bac1..94c1013a837e 100644 --- a/media/java/android/media/tv/ITvInputHardware.aidl +++ b/media/java/android/media/tv/ITvInputHardware.aidl @@ -40,12 +40,6 @@ interface ITvInputHardware { void setStreamVolume(float volume); /** - * Dispatch key event to HDMI service. The events would be automatically converted to - * HDMI CEC commands. If the hardware is not representing an HDMI port, this method will fail. - */ - boolean dispatchKeyEventToHdmi(in KeyEvent event); - - /** * Override default audio sink from audio policy. When override is on, it is * TvInputService's responsibility to adjust to audio configuration change * (for example, when the audio sink becomes unavailable or more desirable diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index d7a9edefa3f2..fd1f2cf66b79 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -2590,12 +2590,9 @@ public final class TvInputManager { } } + /** @removed */ public boolean dispatchKeyEventToHdmi(KeyEvent event) { - try { - return mInterface.dispatchKeyEventToHdmi(event); - } catch (RemoteException e) { - throw new RuntimeException(e); - } + return false; } public void overrideAudioSink(int audioType, String audioAddress, int samplingRate, diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 7f6980de576a..28827e64cf96 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -24,7 +24,7 @@ #include <media/IMediaHTTPService.h> #include <media/MediaPlayerInterface.h> #include <media/MediaAnalyticsItem.h> -#include <media/stagefright/Utils.h> // for FOURCC definition +#include <media/stagefright/foundation/ByteUtils.h> // for FOURCC definition #include <stdio.h> #include <assert.h> #include <limits.h> diff --git a/packages/PrintSpooler/tests/outofprocess/Android.mk b/packages/PrintSpooler/tests/outofprocess/Android.mk index 3c02453c78a1..149be743dbbb 100644 --- a/packages/PrintSpooler/tests/outofprocess/Android.mk +++ b/packages/PrintSpooler/tests/outofprocess/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 print-test-util-lib LOCAL_PACKAGE_NAME := PrintSpoolerOutOfProcessTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/packages/PrintSpooler/tests/outofprocess/AndroidManifest.xml b/packages/PrintSpooler/tests/outofprocess/AndroidManifest.xml index 4a05f6f52a9a..307cc936a567 100644 --- a/packages/PrintSpooler/tests/outofprocess/AndroidManifest.xml +++ b/packages/PrintSpooler/tests/outofprocess/AndroidManifest.xml @@ -21,10 +21,12 @@ <application> <uses-library android:name="android.test.runner" /> - <activity android:name=".PrintTestActivity"/> + <activity + android:name="android.print.test.PrintDocumentActivity" + android:theme="@style/NoAnimation" /> <service - android:name=".mockservice.MockPrintService" + android:name="android.print.test.services.FirstPrintService" android:permission="android.permission.BIND_PRINT_SERVICE"> <intent-filter> @@ -37,13 +39,15 @@ </service> <activity - android:name=".mockservice.SettingsActivity" + android:name="android.print.test.services.SettingsActivity" android:permission="android.permission.START_PRINT_SERVICE_CONFIG_ACTIVITY" + android:theme="@style/NoAnimation" android:exported="true"> </activity> <activity - android:name=".mockservice.AddPrintersActivity" + android:name="android.print.test.services.AddPrintersActivity" + android:theme="@style/NoAnimation" android:exported="true"> </activity> diff --git a/packages/PrintSpooler/tests/outofprocess/res/values/themes.xml b/packages/PrintSpooler/tests/outofprocess/res/values/themes.xml new file mode 100644 index 000000000000..49eb2574da02 --- /dev/null +++ b/packages/PrintSpooler/tests/outofprocess/res/values/themes.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<resources> + <style name="NoAnimation" parent="@android:style/Theme.DeviceDefault"> + <item name="android:windowAnimationStyle">@null</item> + </style> +</resources> diff --git a/packages/PrintSpooler/tests/outofprocess/res/xml/printservice.xml b/packages/PrintSpooler/tests/outofprocess/res/xml/printservice.xml index 9eecf4562bb4..a6282b1c5bb4 100644 --- a/packages/PrintSpooler/tests/outofprocess/res/xml/printservice.xml +++ b/packages/PrintSpooler/tests/outofprocess/res/xml/printservice.xml @@ -17,4 +17,4 @@ --> <print-service xmlns:android="http://schemas.android.com/apk/res/android" - android:addPrintersActivity="com.android.printspooler.outofprocess.tests.mockservice.AddPrintersActivity" /> + android:addPrintersActivity="android.print.test.services.AddPrintersActivity" /> diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/BasePrintTest.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/BasePrintTest.java deleted file mode 100644 index 9a7f362decb2..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/BasePrintTest.java +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests; - -import static android.content.pm.PackageManager.GET_META_DATA; -import static android.content.pm.PackageManager.GET_SERVICES; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doCallRealMethod; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import android.annotation.NonNull; -import android.app.Instrumentation; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.os.CancellationSignal; -import android.os.ParcelFileDescriptor; -import android.print.PrintAttributes; -import android.print.PrintDocumentAdapter; -import android.print.PrintManager; -import android.print.PrinterId; -import android.printservice.CustomPrinterIconCallback; -import android.printservice.PrintJob; -import android.printservice.PrintService; -import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; -import android.support.test.uiautomator.UiDevice; - -import com.android.printspooler.outofprocess.tests.mockservice.PrintServiceCallbacks; -import com.android.printspooler.outofprocess.tests.mockservice.PrinterDiscoverySessionCallbacks; -import com.android.printspooler.outofprocess.tests.mockservice.StubbablePrinterDiscoverySession; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.mockito.stubbing.Answer; - -import java.io.FileInputStream; -import java.io.IOException; -import java.util.List; - -/** - * This is the base class for print tests. - */ -abstract class BasePrintTest { - protected static final long OPERATION_TIMEOUT = 30000; - private static final String PM_CLEAR_SUCCESS_OUTPUT = "Success"; - private static final int CURRENT_USER_ID = -2; // Mirrors UserHandle.USER_CURRENT - private static String sDisabledPrintServicesBefore; - - private android.print.PrintJob mPrintJob; - - private static Instrumentation sInstrumentation; - private static UiDevice sUiDevice; - - @Rule - public ActivityTestRule<PrintTestActivity> mActivityRule = - new ActivityTestRule<>(PrintTestActivity.class, false, true); - - /** - * Return the UI device - * - * @return the UI device - */ - public UiDevice getUiDevice() { - return sUiDevice; - } - - protected static Instrumentation getInstrumentation() { - return sInstrumentation; - } - - @BeforeClass - public static void setUpClass() throws Exception { - sInstrumentation = InstrumentationRegistry.getInstrumentation(); - assumeTrue(sInstrumentation.getContext().getPackageManager().hasSystemFeature( - PackageManager.FEATURE_PRINTING)); - - sUiDevice = UiDevice.getInstance(sInstrumentation); - - // Make sure we start with a clean slate. - clearPrintSpoolerData(); - - disablePrintServices(sInstrumentation.getTargetContext().getPackageName()); - - // Workaround for dexmaker bug: https://code.google.com/p/dexmaker/issues/detail?id=2 - // Dexmaker is used by mockito. - System.setProperty("dexmaker.dexcache", getInstrumentation() - .getTargetContext().getCacheDir().getPath()); - } - - @AfterClass - public static void tearDownClass() throws Exception { - enablePrintServices(); - } - - @Before - public void unlockScreen() throws Exception { - // Unlock screen. - runShellCommand("input keyevent KEYCODE_WAKEUP"); - runShellCommand("wm dismiss-keyguard"); - } - - @After - public void exitActivities() throws Exception { - // Exit print spooler - getUiDevice().pressBack(); - getUiDevice().pressBack(); - } - - protected android.print.PrintJob print(@NonNull final PrintDocumentAdapter adapter, - final PrintAttributes attributes) { - // Initiate printing as if coming from the app. - getInstrumentation().runOnMainSync(() -> { - PrintManager printManager = (PrintManager) getActivity() - .getSystemService(Context.PRINT_SERVICE); - mPrintJob = printManager.print("Print job", adapter, attributes); - }); - - return mPrintJob; - } - - protected PrintTestActivity getActivity() { - return mActivityRule.getActivity(); - } - - public static String runShellCommand(String cmd) - throws IOException { - ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation().executeShellCommand(cmd); - byte[] buf = new byte[512]; - int bytesRead; - FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd); - StringBuilder stdout = new StringBuilder(); - while ((bytesRead = fis.read(buf)) != -1) { - stdout.append(new String(buf, 0, bytesRead)); - } - fis.close(); - return stdout.toString(); - } - - protected static void clearPrintSpoolerData() throws Exception { - assertTrue("failed to clear print spooler data", runShellCommand( - String.format("pm clear --user %d %s", CURRENT_USER_ID, - PrintManager.PRINT_SPOOLER_PACKAGE_NAME)).contains( - PM_CLEAR_SUCCESS_OUTPUT)); - } - - /** - * Disable all print services beside the ones we want to leave enabled. - * - * @param packageToLeaveEnabled The package of the services to leave enabled. - */ - private static void disablePrintServices(String packageToLeaveEnabled) throws IOException { - Instrumentation instrumentation = getInstrumentation(); - - sDisabledPrintServicesBefore = runShellCommand( - "settings get secure " + Settings.Secure.DISABLED_PRINT_SERVICES); - - Intent printServiceIntent = new Intent(android.printservice.PrintService.SERVICE_INTERFACE); - List<ResolveInfo> installedServices = instrumentation.getContext().getPackageManager() - .queryIntentServices(printServiceIntent, GET_SERVICES | GET_META_DATA); - - StringBuilder builder = new StringBuilder(); - for (ResolveInfo service : installedServices) { - if (packageToLeaveEnabled.equals(service.serviceInfo.packageName)) { - continue; - } - if (builder.length() > 0) { - builder.append(":"); - } - builder.append(new ComponentName(service.serviceInfo.packageName, - service.serviceInfo.name).flattenToString()); - } - - runShellCommand( - "settings put secure " + Settings.Secure.DISABLED_PRINT_SERVICES + " " + builder); - } - - /** - * Revert {@link #disablePrintServices(String)} - */ - private static void enablePrintServices() throws IOException { - runShellCommand("settings put secure " + Settings.Secure.DISABLED_PRINT_SERVICES + " " - + sDisabledPrintServicesBefore); - } - - @SuppressWarnings("unchecked") - protected PrinterDiscoverySessionCallbacks createMockPrinterDiscoverySessionCallbacks( - Answer<Void> onStartPrinterDiscovery, Answer<Void> onStopPrinterDiscovery, - Answer<Void> onValidatePrinters, Answer<Void> onStartPrinterStateTracking, - Answer<Void> onRequestCustomPrinterIcon, Answer<Void> onStopPrinterStateTracking, - Answer<Void> onDestroy) { - PrinterDiscoverySessionCallbacks callbacks = mock(PrinterDiscoverySessionCallbacks.class); - - doCallRealMethod().when(callbacks).setSession(any(StubbablePrinterDiscoverySession.class)); - when(callbacks.getSession()).thenCallRealMethod(); - - if (onStartPrinterDiscovery != null) { - doAnswer(onStartPrinterDiscovery).when(callbacks).onStartPrinterDiscovery( - any(List.class)); - } - if (onStopPrinterDiscovery != null) { - doAnswer(onStopPrinterDiscovery).when(callbacks).onStopPrinterDiscovery(); - } - if (onValidatePrinters != null) { - doAnswer(onValidatePrinters).when(callbacks).onValidatePrinters( - any(List.class)); - } - if (onStartPrinterStateTracking != null) { - doAnswer(onStartPrinterStateTracking).when(callbacks).onStartPrinterStateTracking( - any(PrinterId.class)); - } - if (onRequestCustomPrinterIcon != null) { - doAnswer(onRequestCustomPrinterIcon).when(callbacks).onRequestCustomPrinterIcon( - any(PrinterId.class), any(CancellationSignal.class), - any(CustomPrinterIconCallback.class)); - } - if (onStopPrinterStateTracking != null) { - doAnswer(onStopPrinterStateTracking).when(callbacks).onStopPrinterStateTracking( - any(PrinterId.class)); - } - if (onDestroy != null) { - doAnswer(onDestroy).when(callbacks).onDestroy(); - } - - return callbacks; - } - - protected PrintServiceCallbacks createMockPrintServiceCallbacks( - Answer<PrinterDiscoverySessionCallbacks> onCreatePrinterDiscoverySessionCallbacks, - Answer<Void> onPrintJobQueued, Answer<Void> onRequestCancelPrintJob) { - final PrintServiceCallbacks service = mock(PrintServiceCallbacks.class); - - doCallRealMethod().when(service).setService(any(PrintService.class)); - when(service.getService()).thenCallRealMethod(); - - if (onCreatePrinterDiscoverySessionCallbacks != null) { - doAnswer(onCreatePrinterDiscoverySessionCallbacks).when(service) - .onCreatePrinterDiscoverySessionCallbacks(); - } - if (onPrintJobQueued != null) { - doAnswer(onPrintJobQueued).when(service).onPrintJobQueued(any(PrintJob.class)); - } - if (onRequestCancelPrintJob != null) { - doAnswer(onRequestCancelPrintJob).when(service).onRequestCancelPrintJob( - any(PrintJob.class)); - } - - return service; - } -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/PrintTestActivity.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/PrintTestActivity.java deleted file mode 100644 index 4905a0b5b5fa..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/PrintTestActivity.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests; - -import android.app.Activity; -import android.os.Bundle; -import android.view.WindowManager; - -public class PrintTestActivity extends Activity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); - } -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java index 78a0cac623ba..7ebf93d8f4ed 100644 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java +++ b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java @@ -30,6 +30,11 @@ import android.print.PrinterCapabilitiesInfo; import android.print.PrinterId; import android.print.PrinterInfo; import android.print.pdf.PrintedPdfDocument; +import android.print.test.BasePrintTest; +import android.print.test.services.AddPrintersActivity; +import android.print.test.services.FirstPrintService; +import android.print.test.services.PrinterDiscoverySessionCallbacks; +import android.print.test.services.StubbablePrinterDiscoverySession; import android.support.test.filters.LargeTest; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiObject; @@ -38,11 +43,6 @@ import android.support.test.uiautomator.UiSelector; import android.support.test.uiautomator.Until; import android.util.Log; -import com.android.printspooler.outofprocess.tests.mockservice.AddPrintersActivity; -import com.android.printspooler.outofprocess.tests.mockservice.MockPrintService; -import com.android.printspooler.outofprocess.tests.mockservice.PrinterDiscoverySessionCallbacks; -import com.android.printspooler.outofprocess.tests.mockservice.StubbablePrinterDiscoverySession; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -62,10 +62,6 @@ import java.util.function.Supplier; public class WorkflowTest extends BasePrintTest { private static final String LOG_TAG = WorkflowTest.class.getSimpleName(); - private static float sWindowAnimationScaleBefore; - private static float sTransitionAnimationScaleBefore; - private static float sAnimatiorDurationScaleBefore; - private PrintAttributes.MediaSize mFirst; private boolean mSelectPrinter; private PrintAttributes.MediaSize mSecond; @@ -91,7 +87,7 @@ public class WorkflowTest extends BasePrintTest { throws TimeoutException, InterruptedException { long startTime = System.currentTimeMillis(); while (condition.get()) { - long timeLeft = OPERATION_TIMEOUT - (System.currentTimeMillis() - startTime); + long timeLeft = OPERATION_TIMEOUT_MILLIS - (System.currentTimeMillis() - startTime); if (timeLeft < 0) { throw new TimeoutException(); } @@ -156,7 +152,7 @@ public class WorkflowTest extends BasePrintTest { */ private void setMockPrintServiceCallbacks(StubbablePrinterDiscoverySession[] sessionRef, ArrayList<String> trackedPrinters, PrintAttributes.MediaSize mediaSize) { - MockPrintService.setCallbacks(createMockPrintServiceCallbacks( + FirstPrintService.setCallbacks(createMockPrintServiceCallbacks( inv -> createMockPrinterDiscoverySessionCallbacks(inv2 -> { synchronized (sessionRef) { sessionRef[0] = ((PrinterDiscoverySessionCallbacks) inv2.getMock()) @@ -243,7 +239,7 @@ public class WorkflowTest extends BasePrintTest { callback.onWriteFailed(e.getMessage()); } } - }, null); + }, (PrintAttributes) null); } @Parameterized.Parameters @@ -303,7 +299,7 @@ public class WorkflowTest extends BasePrintTest { } else { Log.i(LOG_TAG, "Waiting for error message"); assertNotNull(getUiDevice().wait(Until.findObject( - By.text("This printer isn't available right now.")), OPERATION_TIMEOUT)); + By.text("This printer isn't available right now.")), OPERATION_TIMEOUT_MILLIS)); } setPrinter("All printers\u2026"); @@ -316,7 +312,7 @@ public class WorkflowTest extends BasePrintTest { () -> addPrinter(session[0], "2nd printer", mSecond)); // This executes the observer registered above - clickOn(new UiSelector().text(MockPrintService.class.getCanonicalName()) + clickOn(new UiSelector().text(FirstPrintService.class.getCanonicalName()) .resourceId("com.android.printspooler:id/title")); getUiDevice().pressBack(); @@ -342,7 +338,8 @@ public class WorkflowTest extends BasePrintTest { } else { Log.i(LOG_TAG, "Waiting for error message"); assertNotNull(getUiDevice().wait(Until.findObject( - By.text("This printer isn't available right now.")), OPERATION_TIMEOUT)); + By.text("This printer isn't available right now.")), + OPERATION_TIMEOUT_MILLIS)); } Log.i(LOG_TAG, "Waiting for 1st printer to be not tracked"); @@ -370,7 +367,8 @@ public class WorkflowTest extends BasePrintTest { } else { Log.i(LOG_TAG, "Waiting for error message"); assertNotNull(getUiDevice().wait(Until.findObject( - By.text("This printer isn't available right now.")), OPERATION_TIMEOUT)); + By.text("This printer isn't available right now.")), + OPERATION_TIMEOUT_MILLIS)); } Log.i(LOG_TAG, "Waiting for 1st printer to be tracked"); diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/AddPrintersActivity.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/AddPrintersActivity.java deleted file mode 100644 index 2ea4e7dcdbe2..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/AddPrintersActivity.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests.mockservice; - -import android.app.Activity; -import android.os.Bundle; -import android.support.annotation.NonNull; - -import java.util.ArrayList; - -public class AddPrintersActivity extends Activity { - private static final ArrayList<Runnable> sObservers = new ArrayList<>(); - - public static void addObserver(@NonNull Runnable observer) { - synchronized (sObservers) { - sObservers.add(observer); - } - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - synchronized (sObservers) { - for (Runnable sObserver : sObservers) { - sObserver.run(); - } - } - - finish(); - } - - public static void clearObservers() { - synchronized (sObservers) { - sObservers.clear(); - } - } -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/MockPrintService.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/MockPrintService.java deleted file mode 100644 index 3a231130c5c4..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/MockPrintService.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests.mockservice; - -public class MockPrintService extends StubbablePrintService { - - private static final Object sLock = new Object(); - - private static PrintServiceCallbacks sCallbacks; - - public static void setCallbacks(PrintServiceCallbacks callbacks) { - synchronized (sLock) { - sCallbacks = callbacks; - } - } - - @Override - protected PrintServiceCallbacks getCallbacks() { - synchronized (sLock) { - if (sCallbacks != null) { - sCallbacks.setService(this); - } - return sCallbacks; - } - } -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/PrintServiceCallbacks.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/PrintServiceCallbacks.java deleted file mode 100644 index 07baa0fe1191..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/PrintServiceCallbacks.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests.mockservice; - -import android.printservice.PrintJob; -import android.printservice.PrintService; - -public abstract class PrintServiceCallbacks { - - private PrintService mService; - - public PrintService getService() { - return mService; - } - - public void setService(PrintService service) { - mService = service; - } - - public abstract PrinterDiscoverySessionCallbacks onCreatePrinterDiscoverySessionCallbacks(); - - public abstract void onRequestCancelPrintJob(PrintJob printJob); - - public abstract void onPrintJobQueued(PrintJob printJob); -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/PrinterDiscoverySessionCallbacks.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/PrinterDiscoverySessionCallbacks.java deleted file mode 100644 index 5c1260c37dc4..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/PrinterDiscoverySessionCallbacks.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests.mockservice; - -import android.os.CancellationSignal; -import android.print.PrinterId; -import android.printservice.CustomPrinterIconCallback; - -import java.util.List; - -public abstract class PrinterDiscoverySessionCallbacks { - - private StubbablePrinterDiscoverySession mSession; - - public void setSession(StubbablePrinterDiscoverySession session) { - mSession = session; - } - - public StubbablePrinterDiscoverySession getSession() { - return mSession; - } - - public abstract void onStartPrinterDiscovery(List<PrinterId> priorityList); - - public abstract void onStopPrinterDiscovery(); - - public abstract void onValidatePrinters(List<PrinterId> printerIds); - - public abstract void onStartPrinterStateTracking(PrinterId printerId); - - public abstract void onRequestCustomPrinterIcon(PrinterId printerId, - CancellationSignal cancellationSignal, CustomPrinterIconCallback callback); - - public abstract void onStopPrinterStateTracking(PrinterId printerId); - - public abstract void onDestroy(); -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/StubbablePrintService.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/StubbablePrintService.java deleted file mode 100644 index be9d19b4d634..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/StubbablePrintService.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests.mockservice; - -import android.printservice.PrintJob; -import android.printservice.PrintService; -import android.printservice.PrinterDiscoverySession; - -public abstract class StubbablePrintService extends PrintService { - - @Override - public PrinterDiscoverySession onCreatePrinterDiscoverySession() { - PrintServiceCallbacks callbacks = getCallbacks(); - if (callbacks != null) { - return new StubbablePrinterDiscoverySession(this, - getCallbacks().onCreatePrinterDiscoverySessionCallbacks()); - } - return null; - } - - @Override - public void onRequestCancelPrintJob(PrintJob printJob) { - PrintServiceCallbacks callbacks = getCallbacks(); - if (callbacks != null) { - callbacks.onRequestCancelPrintJob(printJob); - } - } - - @Override - public void onPrintJobQueued(PrintJob printJob) { - PrintServiceCallbacks callbacks = getCallbacks(); - if (callbacks != null) { - callbacks.onPrintJobQueued(printJob); - } - } - - protected abstract PrintServiceCallbacks getCallbacks(); -} diff --git a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/StubbablePrinterDiscoverySession.java b/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/StubbablePrinterDiscoverySession.java deleted file mode 100644 index a828cd6b39db..000000000000 --- a/packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/mockservice/StubbablePrinterDiscoverySession.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.printspooler.outofprocess.tests.mockservice; - -import android.os.CancellationSignal; -import android.print.PrinterId; -import android.printservice.CustomPrinterIconCallback; -import android.printservice.PrintService; -import android.printservice.PrinterDiscoverySession; -import android.support.annotation.NonNull; - -import java.util.List; - -public class StubbablePrinterDiscoverySession extends PrinterDiscoverySession { - private final PrintService mService; - private final PrinterDiscoverySessionCallbacks mCallbacks; - - public StubbablePrinterDiscoverySession(PrintService service, - PrinterDiscoverySessionCallbacks callbacks) { - mService = service; - mCallbacks = callbacks; - if (mCallbacks != null) { - mCallbacks.setSession(this); - } - } - - public PrintService getService() { - return mService; - } - - @Override - public void onStartPrinterDiscovery(@NonNull List<PrinterId> priorityList) { - if (mCallbacks != null) { - mCallbacks.onStartPrinterDiscovery(priorityList); - } - } - - @Override - public void onStopPrinterDiscovery() { - if (mCallbacks != null) { - mCallbacks.onStopPrinterDiscovery(); - } - } - - @Override - public void onValidatePrinters(@NonNull List<PrinterId> printerIds) { - if (mCallbacks != null) { - mCallbacks.onValidatePrinters(printerIds); - } - } - - @Override - public void onStartPrinterStateTracking(@NonNull PrinterId printerId) { - if (mCallbacks != null) { - mCallbacks.onStartPrinterStateTracking(printerId); - } - } - - @Override - public void onRequestCustomPrinterIcon(@NonNull PrinterId printerId, - @NonNull CancellationSignal cancellationSignal, - @NonNull CustomPrinterIconCallback callback) { - if (mCallbacks != null) { - mCallbacks.onRequestCustomPrinterIcon(printerId, cancellationSignal, callback); - } - } - - @Override - public void onStopPrinterStateTracking(@NonNull PrinterId printerId) { - if (mCallbacks != null) { - mCallbacks.onStopPrinterStateTracking(printerId); - } - } - - @Override - public void onDestroy() { - if (mCallbacks != null) { - mCallbacks.onDestroy(); - } - } -} diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractConnectivityPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractConnectivityPreferenceController.java index f4e050c76b19..c6552f77a2b2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractConnectivityPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractConnectivityPreferenceController.java @@ -43,18 +43,20 @@ public abstract class AbstractConnectivityPreferenceController public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if (ArrayUtils.contains(getConnectivityIntents(), action)) { - mHandler.sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY); + getHandler().sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY); } } }; private static final int EVENT_UPDATE_CONNECTIVITY = 600; - private final Handler mHandler = new ConnectivityEventHandler(this); + private Handler mHandler; public AbstractConnectivityPreferenceController(Context context, Lifecycle lifecycle) { super(context); - lifecycle.addObserver(this); + if (lifecycle != null) { + lifecycle.addObserver(this); + } } @Override @@ -78,6 +80,13 @@ public abstract class AbstractConnectivityPreferenceController protected abstract void updateConnectivity(); + private Handler getHandler() { + if (mHandler == null) { + mHandler = new ConnectivityEventHandler(this); + } + return mHandler; + } + private static class ConnectivityEventHandler extends Handler { private WeakReference<AbstractConnectivityPreferenceController> mPreferenceController; diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java index f675d3e5c0b3..ac61ade19222 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java @@ -44,21 +44,23 @@ public abstract class AbstractUptimePreferenceController extends AbstractPrefere private static final int EVENT_UPDATE_STATS = 500; private Preference mUptime; - private final Handler mHandler = new MyHandler(this); + private Handler mHandler; public AbstractUptimePreferenceController(Context context, Lifecycle lifecycle) { super(context); - lifecycle.addObserver(this); + if (lifecycle != null) { + lifecycle.addObserver(this); + } } @Override public void onStart() { - mHandler.sendEmptyMessage(EVENT_UPDATE_STATS); + getHandler().sendEmptyMessage(EVENT_UPDATE_STATS); } @Override public void onStop() { - mHandler.removeMessages(EVENT_UPDATE_STATS); + getHandler().removeMessages(EVENT_UPDATE_STATS); } @Override @@ -78,6 +80,13 @@ public abstract class AbstractUptimePreferenceController extends AbstractPrefere updateTimes(); } + private Handler getHandler() { + if (mHandler == null) { + mHandler = new MyHandler(this); + } + return mHandler; + } + private void updateTimes() { mUptime.setSummary(DateUtils.formatDuration(SystemClock.elapsedRealtime())); } diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index 12455d85588b..c56e1da14921 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -291,15 +291,6 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro } /** - * Force a scan for wifi networks to happen now. - */ - public void forceScan() { - if (mWifiManager.isWifiEnabled() && mScanner != null) { - mScanner.forceScan(); - } - } - - /** * Temporarily stop scanning for wifi networks. */ public void pauseScanning() { @@ -789,14 +780,6 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro } } - public static List<AccessPoint> getCurrentAccessPoints(Context context, boolean includeSaved, - boolean includeScans) { - WifiTracker tracker = new WifiTracker(context, null, includeSaved, includeScans); - tracker.forceUpdate(); - tracker.copyAndNotifyListeners(false /*notifyListeners*/); - return tracker.getAccessPoints(); - } - @VisibleForTesting final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override @@ -986,11 +969,6 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro } } - void forceScan() { - removeMessages(MSG_SCAN); - sendEmptyMessage(MSG_SCAN); - } - void pause() { mRetry = 0; removeMessages(MSG_SCAN); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java index 666a2a8ff413..f68533ba4081 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java @@ -31,14 +31,13 @@ import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; -import org.robolectric.shadows.ShadowLooper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowLooper; @RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @@ -73,7 +72,7 @@ public class UptimePreferenceControllerTest { @Test public void testUptimeTick() { final AbstractUptimePreferenceController uptimePreferenceController = - new ConcreteUptimePreferenceController(mContext, mLifecycle); + new ConcreteUptimePreferenceController(mContext, null /* lifecycle */); uptimePreferenceController.displayPreference(mScreen); diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java index 1f633da4644a..95ff13b45fb9 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/GlobalActions.java @@ -29,6 +29,9 @@ public interface GlobalActions extends Plugin { default void showShutdownUi(boolean isReboot, String reason) { } + default void destroy() { + } + @ProvidesInterface(version = GlobalActionsManager.VERSION) public interface GlobalActionsManager { int VERSION = 1; diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java index 4b377153e558..592dda073d32 100644 --- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java @@ -83,7 +83,6 @@ public class SwipeHelper implements Gefingerpoken { private boolean mMenuRowIntercepting; private boolean mLongPressSent; - private LongPressListener mLongPressListener; private Runnable mWatchLongPress; private final long mLongPressTimeout; @@ -115,10 +114,6 @@ public class SwipeHelper implements Gefingerpoken { mFlingAnimationUtils = new FlingAnimationUtils(context, getMaxEscapeAnimDuration() / 1000f); } - public void setLongPressListener(LongPressListener listener) { - mLongPressListener = listener; - } - public void setDensityScale(float densityScale) { mDensityScale = densityScale; } @@ -257,7 +252,7 @@ public class SwipeHelper implements Gefingerpoken { } } - public void removeLongPressCallback() { + public void cancelLongPress() { if (mWatchLongPress != null) { mHandler.removeCallbacks(mWatchLongPress); mWatchLongPress = null; @@ -288,33 +283,27 @@ public class SwipeHelper implements Gefingerpoken { mInitialTouchPos = getPos(ev); mPerpendicularInitialTouchPos = getPerpendicularPos(ev); mTranslation = getTranslation(mCurrView); - if (mLongPressListener != null) { - if (mWatchLongPress == null) { - mWatchLongPress = new Runnable() { - @Override - public void run() { - if (mCurrView != null && !mLongPressSent) { - mLongPressSent = true; + if (mWatchLongPress == null) { + mWatchLongPress = new Runnable() { + @Override + public void run() { + if (mCurrView != null && !mLongPressSent) { + mLongPressSent = true; + mCurrView.getLocationOnScreen(mTmpPos); + final int x = (int) ev.getRawX() - mTmpPos[0]; + final int y = (int) ev.getRawY() - mTmpPos[1]; + if (mCurrView instanceof ExpandableNotificationRow) { mCurrView.sendAccessibilityEvent( AccessibilityEvent.TYPE_VIEW_LONG_CLICKED); - mCurrView.getLocationOnScreen(mTmpPos); - final int x = (int) ev.getRawX() - mTmpPos[0]; - final int y = (int) ev.getRawY() - mTmpPos[1]; - MenuItem menuItem = null; - if (mCurrView instanceof ExpandableNotificationRow) { - menuItem = ((ExpandableNotificationRow) mCurrView) - .getProvider().getLongpressMenuItem(mContext); - } - if (menuItem != null) { - mLongPressListener.onLongPress(mCurrView, x, y, - menuItem); - } + ExpandableNotificationRow currRow = + (ExpandableNotificationRow) mCurrView; + currRow.doLongClickCallback(x, y); } } - }; - } - mHandler.postDelayed(mWatchLongPress, mLongPressTimeout); + } + }; } + mHandler.postDelayed(mWatchLongPress, mLongPressTimeout); } break; @@ -331,7 +320,7 @@ public class SwipeHelper implements Gefingerpoken { mDragging = true; mInitialTouchPos = getPos(ev); mTranslation = getTranslation(mCurrView); - removeLongPressCallback(); + cancelLongPress(); } } break; @@ -343,7 +332,7 @@ public class SwipeHelper implements Gefingerpoken { mCurrView = null; mLongPressSent = false; mMenuRowIntercepting = false; - removeLongPressCallback(); + cancelLongPress(); if (captured) return true; break; } @@ -586,7 +575,7 @@ public class SwipeHelper implements Gefingerpoken { // We are not doing anything, make sure the long press callback // is not still ticking like a bomb waiting to go off. - removeLongPressCallback(); + cancelLongPress(); return false; } } @@ -734,15 +723,4 @@ public class SwipeHelper implements Gefingerpoken { */ float getFalsingThresholdFactor(); } - - /** - * Equivalent to View.OnLongClickListener with coordinates - */ - public interface LongPressListener { - /** - * Equivalent to {@link View.OnLongClickListener#onLongClick(View)} with coordinates - * @return whether the longpress was handled - */ - boolean onLongPress(View v, int x, int y, MenuItem item); - } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java index dc626fb4df65..851b78cfcd49 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java @@ -84,9 +84,6 @@ public class DozeUi implements DozeMachine.Part { case DOZE_REQUEST_PULSE: pulseWhileDozing(mMachine.getPulseReason()); break; - case DOZE_PULSE_DONE: - mHost.abortPulsing(); - break; case INITIALIZED: mHost.startDozing(); break; diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsComponent.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsComponent.java index 09a08f09fc9a..f06cda0f787a 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsComponent.java @@ -31,6 +31,7 @@ import android.os.ServiceManager; public class GlobalActionsComponent extends SystemUI implements Callbacks, GlobalActionsManager { + private GlobalActions mPlugin; private Extension<GlobalActions> mExtension; private IStatusBarService mBarService; @@ -41,10 +42,19 @@ public class GlobalActionsComponent extends SystemUI implements Callbacks, Globa mExtension = Dependency.get(ExtensionController.class).newExtension(GlobalActions.class) .withPlugin(GlobalActions.class) .withDefault(() -> new GlobalActionsImpl(mContext)) + .withCallback(this::onExtensionCallback) .build(); + mPlugin = mExtension.get(); SysUiServiceProvider.getComponent(mContext, CommandQueue.class).addCallbacks(this); } + private void onExtensionCallback(GlobalActions newPlugin) { + if (mPlugin != null) { + mPlugin.destroy(); + } + mPlugin = newPlugin; + } + @Override public void handleShowShutdownUi(boolean isReboot, String reason) { mExtension.get().showShutdownUi(isReboot, reason); diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 189badfc42fc..d82f9cd44e4a 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -16,27 +16,6 @@ package com.android.systemui.globalactions; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN; -import com.android.internal.R; -import com.android.internal.colorextraction.ColorExtractor; -import com.android.internal.colorextraction.ColorExtractor.GradientColors; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.internal.util.EmergencyAffordanceManager; -import com.android.internal.telephony.TelephonyIntents; -import com.android.internal.telephony.TelephonyProperties; -import com.android.internal.widget.LockPatternUtils; -import com.android.systemui.Dependency; -import com.android.systemui.HardwareUiLayout; -import com.android.systemui.Interpolators; -import com.android.systemui.colorextraction.SysuiColorExtractor; -import com.android.systemui.plugins.GlobalActions.GlobalActionsManager; -import com.android.systemui.statusbar.notification.NotificationUtils; -import com.android.systemui.statusbar.phone.ScrimController; -import com.android.systemui.volume.VolumeDialogMotion.LogAccelerateInterpolator; -import com.android.systemui.volume.VolumeDialogMotion.LogDecelerateInterpolator; - -import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; import android.app.ActivityManager; import android.app.Dialog; import android.app.WallpaperManager; @@ -69,7 +48,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; -import android.util.MathUtils; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -86,7 +64,23 @@ import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.internal.R; +import com.android.internal.colorextraction.ColorExtractor; +import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.colorextraction.drawable.GradientDrawable; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.telephony.TelephonyIntents; +import com.android.internal.telephony.TelephonyProperties; +import com.android.internal.util.EmergencyAffordanceManager; +import com.android.internal.widget.LockPatternUtils; +import com.android.systemui.Dependency; +import com.android.systemui.HardwareUiLayout; +import com.android.systemui.Interpolators; +import com.android.systemui.colorextraction.SysuiColorExtractor; +import com.android.systemui.plugins.GlobalActions.GlobalActionsManager; +import com.android.systemui.statusbar.phone.ScrimController; +import com.android.systemui.volume.VolumeDialogMotion.LogAccelerateInterpolator; import java.util.ArrayList; import java.util.List; @@ -96,7 +90,8 @@ import java.util.List; * may show depending on whether the keyguard is showing, and whether the device * is provisioned. */ -class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogInterface.OnClickListener { +class GlobalActionsDialog implements DialogInterface.OnDismissListener, + DialogInterface.OnClickListener { static public final String SYSTEM_DIALOG_REASON_KEY = "reason"; static public final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions"; @@ -195,6 +190,14 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn } } + /** + * Dismiss the global actions dialog, if it's currently shown + */ + public void dismissDialog() { + mHandler.removeMessages(MESSAGE_DISMISS); + mHandler.sendEmptyMessage(MESSAGE_DISMISS); + } + private void awakenIfNecessary() { if (mDreamManager != null) { try { diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index 2cf230c8e12d..35634374d5dd 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -14,12 +14,12 @@ package com.android.systemui.globalactions; +import static android.app.StatusBarManager.DISABLE2_GLOBAL_ACTIONS; + import android.app.Dialog; import android.app.KeyguardManager; -import android.app.WallpaperColors; import android.app.WallpaperManager; import android.content.Context; -import android.graphics.Color; import android.graphics.Point; import android.view.ViewGroup; import android.view.Window; @@ -32,12 +32,14 @@ import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.colorextraction.drawable.GradientDrawable; import com.android.settingslib.Utils; import com.android.systemui.Dependency; +import com.android.systemui.SysUiServiceProvider; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.plugins.GlobalActions; +import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.KeyguardMonitor; -public class GlobalActionsImpl implements GlobalActions { +public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks { private static final float SHUTDOWN_SCRIM_ALPHA = 0.95f; @@ -45,15 +47,23 @@ public class GlobalActionsImpl implements GlobalActions { private final KeyguardMonitor mKeyguardMonitor; private final DeviceProvisionedController mDeviceProvisionedController; private GlobalActionsDialog mGlobalActions; + private boolean mDisabled; public GlobalActionsImpl(Context context) { mContext = context; mKeyguardMonitor = Dependency.get(KeyguardMonitor.class); mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class); + SysUiServiceProvider.getComponent(context, CommandQueue.class).addCallbacks(this); + } + + @Override + public void destroy() { + SysUiServiceProvider.getComponent(mContext, CommandQueue.class).removeCallbacks(this); } @Override public void showGlobalActions(GlobalActionsManager manager) { + if (mDisabled) return; if (mGlobalActions == null) { mGlobalActions = new GlobalActionsDialog(mContext, manager); } @@ -107,4 +117,14 @@ public class GlobalActionsImpl implements GlobalActions { d.show(); } + + @Override + public void disable(int state1, int state2, boolean animate) { + final boolean disabled = (state2 & DISABLE2_GLOBAL_ACTIONS) != 0; + if (disabled == mDisabled) return; + mDisabled = disabled; + if (disabled && mGlobalActions != null) { + mGlobalActions.dismissDialog(); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 966e78997244..6c5f4b237033 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -36,6 +36,7 @@ import android.service.notification.StatusBarNotification; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.Property; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.NotificationHeaderView; @@ -174,6 +175,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private boolean mShowNoBackground; private ExpandableNotificationRow mNotificationParent; private OnExpandClickListener mOnExpandClickListener; + + // Listener will be called when receiving a long click event. + // Use #setLongPressPosition to optionally assign positional data with the long press. + private LongPressListener mLongPressListener; + private boolean mGroupExpansionChanging; /** @@ -788,6 +794,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView mOnExpandClickListener = onExpandClickListener; } + public void setLongPressListener(LongPressListener longPressListener) { + mLongPressListener = longPressListener; + } + @Override public void setOnClickListener(@Nullable OnClickListener l) { super.setOnClickListener(l); @@ -1338,6 +1348,47 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } } + private void doLongClickCallback() { + doLongClickCallback(getWidth() / 2, getHeight() / 2); + } + + public void doLongClickCallback(int x, int y) { + createMenu(); + MenuItem menuItem = getProvider().getLongpressMenuItem(mContext); + if (mLongPressListener != null && menuItem != null) { + mLongPressListener.onLongPress(this, x, y, menuItem); + } + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (KeyEvent.isConfirmKey(keyCode)) { + event.startTracking(); + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (KeyEvent.isConfirmKey(keyCode)) { + if (!event.isCanceled()) { + performClick(); + } + return true; + } + return super.onKeyUp(keyCode, event); + } + + @Override + public boolean onKeyLongPress(int keyCode, KeyEvent event) { + if (KeyEvent.isConfirmKey(keyCode)) { + doLongClickCallback(); + return true; + } + return false; + } + public void resetTranslation() { if (mTranslateAnim != null) { mTranslateAnim.cancel(); @@ -2205,6 +2256,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView @Override public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfoInternal(info); + info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK); if (canViewBeDismissed()) { info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS); } @@ -2244,6 +2296,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView case AccessibilityNodeInfo.ACTION_EXPAND: mExpandClickListener.onClick(this); return true; + case AccessibilityNodeInfo.ACTION_LONG_CLICK: + doLongClickCallback(); + return true; } return false; } @@ -2332,4 +2387,15 @@ public class ExpandableNotificationRow extends ActivatableNotificationView protected void setChildrenContainer(NotificationChildrenContainer childrenContainer) { mChildrenContainer = childrenContainer; } + + /** + * Equivalent to View.OnLongClickListener with coordinates + */ + public interface LongPressListener { + /** + * Equivalent to {@link View.OnLongClickListener#onLongClick(View)} with coordinates + * @return whether the longpress was handled + */ + boolean onLongPress(View v, int x, int y, MenuItem item); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 59d3e0a3e356..2ad881f5d722 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -44,6 +44,7 @@ import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.recents.Recents; import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener; +import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment; @@ -247,11 +248,12 @@ public class CarStatusBar extends StatusBar implements } /** - * Returns the {@link com.android.systemui.SwipeHelper.LongPressListener} that will be - * triggered when a notification card is long-pressed. + * Returns the + * {@link com.android.systemui.statusbar.ExpandableNotificationRow.LongPressListener} that will + * be triggered when a notification card is long-pressed. */ @Override - protected SwipeHelper.LongPressListener getNotificationLongClicker() { + protected ExpandableNotificationRow.LongPressListener getNotificationLongClicker() { // For the automative use case, we do not want to the user to be able to interact with // a notification other than a regular click. As a result, just return null for the // long click listener. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 7b11ace88c7a..af03440629db 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -704,7 +704,7 @@ public class NotificationPanelView extends PanelView implements mInitialHeightOnTouch = mQsExpansionHeight; mQsTracking = true; mIntercepting = false; - mNotificationStackScroller.removeLongPressCallback(); + mNotificationStackScroller.cancelLongPress(); } break; case MotionEvent.ACTION_POINTER_UP: @@ -740,7 +740,7 @@ public class NotificationPanelView extends PanelView implements mInitialTouchY = y; mInitialTouchX = x; mIntercepting = false; - mNotificationStackScroller.removeLongPressCallback(); + mNotificationStackScroller.cancelLongPress(); return true; } break; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 54be857df77c..3a6819eb9105 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -160,7 +160,6 @@ import com.android.systemui.Interpolators; import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.RecentsComponent; -import com.android.systemui.SwipeHelper; import com.android.systemui.SystemUI; import com.android.systemui.SystemUIFactory; import com.android.systemui.UiOffloadThread; @@ -4838,7 +4837,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onTouchSlopExceeded() { - mStackScroller.removeLongPressCallback(); + mStackScroller.cancelLongPress(); mStackScroller.checkSnoozeLeavebehind(); } @@ -5470,7 +5469,7 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onDoubleTap(float screenX, float screenY) { - if (screenX > 0 && screenY > 0 && mAmbientIndicationContainer != null + if (screenX > 0 && screenY > 0 && mAmbientIndicationContainer != null && mAmbientIndicationContainer.getVisibility() == View.VISIBLE) { mAmbientIndicationContainer.getLocationOnScreen(mTmpInt2); float viewX = screenX - mTmpInt2[0]; @@ -6296,14 +6295,15 @@ public class StatusBar extends SystemUI implements DemoMode, true /* removeControls */, x, y, true /* resetMenu */); } - protected SwipeHelper.LongPressListener getNotificationLongClicker() { - return new SwipeHelper.LongPressListener() { + protected ExpandableNotificationRow.LongPressListener getNotificationLongClicker() { + return new ExpandableNotificationRow.LongPressListener() { @Override public boolean onLongPress(View v, final int x, final int y, MenuItem item) { if (!(v instanceof ExpandableNotificationRow)) { return false; } + if (v.getWindowToken() == null) { Log.e(TAG, "Trying to show notification guts, but not attached to window"); return false; @@ -6318,7 +6318,7 @@ public class StatusBar extends SystemUI implements DemoMode, closeAndSaveGuts(false /* removeLeavebehind */, false /* force */, true /* removeControls */, -1 /* x */, -1 /* y */, true /* resetMenu */); - return false; + return true; } bindGuts(row, item); NotificationGuts guts = row.getGuts(); @@ -6598,6 +6598,7 @@ public class StatusBar extends SystemUI implements DemoMode, row.setRemoteViewClickHandler(mOnClickHandler); row.setInflationCallback(this); row.setSecureStateProvider(this::isKeyguardCurrentlySecure); + row.setLongPressListener(getNotificationLongClicker()); // Get the app name. // Note that Notification.Builder#bindHeaderAppName has similar logic diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 75532d9e09be..1e14626d9c99 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -240,7 +240,7 @@ public class NotificationStackScrollLayout extends ViewGroup * motion. */ private int mMaxScrollAfterExpand; - private SwipeHelper.LongPressListener mLongPressListener; + private ExpandableNotificationRow.LongPressListener mLongPressListener; private NotificationMenuRowPlugin mCurrMenuRow; private View mTranslatingParentView; @@ -410,7 +410,6 @@ public class NotificationStackScrollLayout extends ViewGroup mExpandHelper.setEventSource(this); mExpandHelper.setScrollAdapter(this); mSwipeHelper = new NotificationSwipeHelper(SwipeHelper.X, this, getContext()); - mSwipeHelper.setLongPressListener(mLongPressListener); mStackScrollAlgorithm = createStackScrollAlgorithm(context); initView(context); mFalsingManager = FalsingManager.getInstance(context); @@ -884,8 +883,7 @@ public class NotificationStackScrollLayout extends ViewGroup return firstChild != null ? firstChild.getMinHeight() : mCollapsedSize; } - public void setLongPressListener(SwipeHelper.LongPressListener listener) { - mSwipeHelper.setLongPressListener(listener); + public void setLongPressListener(ExpandableNotificationRow.LongPressListener listener) { mLongPressListener = listener; } @@ -1175,7 +1173,7 @@ public class NotificationStackScrollLayout extends ViewGroup if (v instanceof ExpandableNotificationRow) { ((ExpandableNotificationRow) v).setUserLocked(userLocked); } - removeLongPressCallback(); + cancelLongPress(); requestDisallowInterceptTouchEvent(true); } @@ -2581,7 +2579,7 @@ public class NotificationStackScrollLayout extends ViewGroup public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) { super.requestDisallowInterceptTouchEvent(disallowIntercept); if (disallowIntercept) { - mSwipeHelper.removeLongPressCallback(); + cancelLongPress(); } } @@ -3302,7 +3300,7 @@ public class NotificationStackScrollLayout extends ViewGroup mIsBeingDragged = isDragged; if (isDragged) { requestDisallowInterceptTouchEvent(true); - removeLongPressCallback(); + cancelLongPress(); } } @@ -3310,7 +3308,7 @@ public class NotificationStackScrollLayout extends ViewGroup public void onWindowFocusChanged(boolean hasWindowFocus) { super.onWindowFocusChanged(hasWindowFocus); if (!hasWindowFocus) { - removeLongPressCallback(); + cancelLongPress(); } } @@ -3324,7 +3322,7 @@ public class NotificationStackScrollLayout extends ViewGroup @Override public void requestDisallowLongPress() { - removeLongPressCallback(); + cancelLongPress(); } @Override @@ -3332,8 +3330,8 @@ public class NotificationStackScrollLayout extends ViewGroup mDisallowDismissInThisMotion = true; } - public void removeLongPressCallback() { - mSwipeHelper.removeLongPressCallback(); + public void cancelLongPress() { + mSwipeHelper.cancelLongPress(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java index b83590979ef7..5ec3dff0043c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java @@ -23,7 +23,7 @@ import android.os.Handler; */ public class DelayedWakeLock implements WakeLock { - private static final long RELEASE_DELAY_MS = 100; + private static final long RELEASE_DELAY_MS = 120; private final Handler mHandler; private final WakeLock mInner; diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index e17a6a6aefa9..4834f3893240 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -4665,6 +4665,9 @@ message MetricsEvent { // OS: P DIALOG_CLEAR_ADB_KEYS = 1223; + // Open: Settings > Developer options > Quick setting tile config + DEVELOPMENT_QS_TILE_CONFIG = 1224; + // Add new aosp constants above this line. // END OF AOSP CONSTANTS } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 0b2dd9b8d5e3..ba3b2cdd4c36 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2112,7 +2112,8 @@ public class ActivityManagerService extends IActivityManager.Stub String text = mContext.getString(R.string.heavy_weight_notification, context.getApplicationInfo().loadLabel(context.getPackageManager())); Notification notification = - new Notification.Builder(context, SystemNotificationChannels.DEVELOPER) + new Notification.Builder(context, + SystemNotificationChannels.HEAVY_WEIGHT_APP) .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb) .setWhen(0) .setOngoing(true) @@ -2146,7 +2147,7 @@ public class ActivityManagerService extends IActivityManager.Stub } try { inm.cancelNotificationWithTag("android", null, - SystemMessage.NOTE_HEAVY_WEIGHT_NOTIFICATION, msg.arg1); + SystemMessage.NOTE_HEAVY_WEIGHT_NOTIFICATION, msg.arg1); } catch (RuntimeException e) { Slog.w(ActivityManagerService.TAG, "Error canceling notification for service", e); @@ -5096,11 +5097,12 @@ public class ActivityManagerService extends IActivityManager.Stub } synchronized(this) { - if (mHeavyWeightProcess == null) { + final ProcessRecord proc = mHeavyWeightProcess; + if (proc == null) { return; } - ArrayList<ActivityRecord> activities = new ArrayList<>(mHeavyWeightProcess.activities); + ArrayList<ActivityRecord> activities = new ArrayList<>(proc.activities); for (int i = 0; i < activities.size(); i++) { ActivityRecord r = activities.get(i); if (!r.finishing && r.isInStackLocked()) { @@ -5110,7 +5112,7 @@ public class ActivityManagerService extends IActivityManager.Stub } mHandler.sendMessage(mHandler.obtainMessage(CANCEL_HEAVY_NOTIFICATION_MSG, - mHeavyWeightProcess.userId, 0)); + proc.userId, 0)); mHeavyWeightProcess = null; } } @@ -12939,6 +12941,10 @@ public class ActivityManagerService extends IActivityManager.Stub throw new IllegalArgumentException("Provided bugreport type is not correct, value: " + bugreportType); } + // Always log caller, even if it does not have permission to dump. + String type = extraOptions == null ? "bugreport" : extraOptions; + Slog.i(TAG, type + " requested by UID " + Binder.getCallingUid()); + enforceCallingPermission(android.Manifest.permission.DUMP, "requestBugReport"); if (extraOptions != null) { SystemProperties.set("dumpstate.options", extraOptions); diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java index 5583e86cde70..d7cd81ff3c5f 100644 --- a/services/core/java/com/android/server/connectivity/Tethering.java +++ b/services/core/java/com/android/server/connectivity/Tethering.java @@ -1371,6 +1371,7 @@ public class Tethering extends BaseNetworkObserver { sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS); } } + mUpstreamNetworkMonitor.setCurrentUpstream((ns != null) ? ns.network : null); setUpstreamNetwork(ns); } diff --git a/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java b/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java index c5f752807cb7..b35ed75106b3 100644 --- a/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java @@ -95,7 +95,10 @@ public class UpstreamNetworkMonitor { private NetworkCallback mDefaultNetworkCallback; private NetworkCallback mMobileNetworkCallback; private boolean mDunRequired; - private Network mCurrentDefault; + // The current system default network (not really used yet). + private Network mDefaultInternetNetwork; + // The current upstream network used for tethering. + private Network mTetheringUpstreamNetwork; public UpstreamNetworkMonitor(Context ctx, StateMachine tgt, SharedLog log, int what) { mContext = ctx; @@ -130,10 +133,12 @@ public class UpstreamNetworkMonitor { releaseCallback(mDefaultNetworkCallback); mDefaultNetworkCallback = null; + mDefaultInternetNetwork = null; releaseCallback(mListenAllCallback); mListenAllCallback = null; + mTetheringUpstreamNetwork = null; mNetworkMap.clear(); } @@ -207,7 +212,7 @@ public class UpstreamNetworkMonitor { break; default: /* If we've found an active upstream connection that's not DUN/HIPRI - * we should stop any outstanding DUN/HIPRI start requests. + * we should stop any outstanding DUN/HIPRI requests. * * If we found NONE we don't want to do this as we want any previous * requests to keep trying to bring up something we can use. @@ -219,6 +224,10 @@ public class UpstreamNetworkMonitor { return typeStatePair.ns; } + public void setCurrentUpstream(Network upstream) { + mTetheringUpstreamNetwork = upstream; + } + public Set<IpPrefix> getLocalPrefixes() { return (Set<IpPrefix>) mLocalPrefixes.clone(); } @@ -250,7 +259,7 @@ public class UpstreamNetworkMonitor { // These request*() calls can be deleted post oag/339444. return; } - mCurrentDefault = network; + mDefaultInternetNetwork = network; break; case CALLBACK_MOBILE_REQUEST: @@ -302,6 +311,13 @@ public class UpstreamNetworkMonitor { network, newNc)); } + // Log changes in upstream network signal strength, if available. + if (network.equals(mTetheringUpstreamNetwork) && newNc.hasSignalStrength()) { + final int newSignal = newNc.getSignalStrength(); + final String prevSignal = getSignalStrength(prev.networkCapabilities); + mLog.logf("upstream network signal strength: %s -> %s", prevSignal, newSignal); + } + mNetworkMap.put(network, new NetworkState( null, prev.linkProperties, newNc, network, null, null)); // TODO: If sufficient information is available to select a more @@ -330,9 +346,21 @@ public class UpstreamNetworkMonitor { notifyTarget(EVENT_ON_LINKPROPERTIES, network); } + private void handleSuspended(int callbackType, Network network) { + if (callbackType != CALLBACK_LISTEN_ALL) return; + if (!network.equals(mTetheringUpstreamNetwork)) return; + mLog.log("SUSPENDED current upstream: " + network); + } + + private void handleResumed(int callbackType, Network network) { + if (callbackType != CALLBACK_LISTEN_ALL) return; + if (!network.equals(mTetheringUpstreamNetwork)) return; + mLog.log("RESUMED current upstream: " + network); + } + private void handleLost(int callbackType, Network network) { if (callbackType == CALLBACK_TRACK_DEFAULT) { - mCurrentDefault = null; + mDefaultInternetNetwork = null; // Receiving onLost() for a default network does not necessarily // mean the network is gone. We wait for a separate notification // on either the LISTEN_ALL or MOBILE_REQUEST callbacks before @@ -401,8 +429,15 @@ public class UpstreamNetworkMonitor { recomputeLocalPrefixes(); } - // TODO: Handle onNetworkSuspended(); - // TODO: Handle onNetworkResumed(); + @Override + public void onNetworkSuspended(Network network) { + handleSuspended(mCallbackType, network); + } + + @Override + public void onNetworkResumed(Network network) { + handleResumed(mCallbackType, network); + } @Override public void onLost(Network network) { @@ -467,4 +502,9 @@ public class UpstreamNetworkMonitor { return prefixSet; } + + private static String getSignalStrength(NetworkCapabilities nc) { + if (nc == null || !nc.hasSignalStrength()) return "unknown"; + return Integer.toString(nc.getSignalStrength()); + } } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 14cd055506a5..168f070a7728 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -282,6 +282,7 @@ public class NotificationManagerService extends SystemService { private WindowManagerInternal mWindowManagerInternal; private AlarmManager mAlarmManager; private ICompanionDeviceManager mCompanionManager; + private AccessibilityManager mAccessibilityManager; final IBinder mForegroundToken = new Binder(); private WorkerHandler mHandler; @@ -1221,6 +1222,12 @@ public class NotificationManagerService extends SystemService { mUsageStats = us; } + @VisibleForTesting + void setAccessibilityManager(AccessibilityManager am) { + mAccessibilityManager = am; + } + + // TODO: All tests should use this init instead of the one-off setters above. @VisibleForTesting void init(Looper looper, IPackageManager packageManager, @@ -1235,6 +1242,8 @@ public class NotificationManagerService extends SystemService { Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE, DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE); + mAccessibilityManager = + (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE); mAm = ActivityManager.getService(); mPackageManager = packageManager; mPackageManagerClient = packageManagerClient; @@ -4117,13 +4126,16 @@ public class NotificationManagerService extends SystemService { // These are set inside the conditional if the notification is allowed to make noise. boolean hasValidVibrate = false; boolean hasValidSound = false; + boolean sentAccessibilityEvent = false; + // If the notification will appear in the status bar, it should send an accessibility + // event + if (!record.isUpdate && record.getImportance() > IMPORTANCE_MIN) { + sendAccessibilityEvent(notification, record.sbn.getPackageName()); + sentAccessibilityEvent = true; + } if (aboveThreshold && isNotificationForCurrentUser(record)) { - // If the notification will appear in the status bar, it should send an accessibility - // event - if (!record.isUpdate && record.getImportance() > IMPORTANCE_MIN) { - sendAccessibilityEvent(notification, record.sbn.getPackageName()); - } + if (mSystemReady && mAudioManager != null) { Uri soundUri = record.getSound(); hasValidSound = soundUri != null && !Uri.EMPTY.equals(soundUri); @@ -4141,6 +4153,10 @@ public class NotificationManagerService extends SystemService { boolean hasAudibleAlert = hasValidSound || hasValidVibrate; if (hasAudibleAlert && !shouldMuteNotificationLocked(record)) { + if (!sentAccessibilityEvent) { + sendAccessibilityEvent(notification, record.sbn.getPackageName()); + sentAccessibilityEvent = true; + } if (DBG) Slog.v(TAG, "Interrupting!"); if (hasValidSound) { mSoundNotificationKey = key; @@ -4661,8 +4677,7 @@ public class NotificationManagerService extends SystemService { } void sendAccessibilityEvent(Notification notification, CharSequence packageName) { - AccessibilityManager manager = AccessibilityManager.getInstance(getContext()); - if (!manager.isEnabled()) { + if (!mAccessibilityManager.isEnabled()) { return; } @@ -4676,7 +4691,7 @@ public class NotificationManagerService extends SystemService { event.getText().add(tickerText); } - manager.sendAccessibilityEvent(event); + mAccessibilityManager.sendAccessibilityEvent(event); } /** diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 261ae9018414..d7329dbf0e4c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3365,7 +3365,9 @@ public class PackageManagerService extends IPackageManager.Stub @Override public boolean isUpgrade() { // allow instant applications - return mIsUpgrade; + // The system property allows testing ota flow when upgraded to the same image. + return mIsUpgrade || SystemProperties.getBoolean( + "persist.pm.mock-upgrade", false /* default */); } private @Nullable String getRequiredButNotReallyRequiredVerifierLPr() { diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index 342ec4b79fed..7a2e630cfdac 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -58,6 +58,9 @@ class GlobalActions implements GlobalActionsListener { public void showDialog(boolean keyguardShowing, boolean deviceProvisioned) { if (DEBUG) Slog.d(TAG, "showDialog " + keyguardShowing + " " + deviceProvisioned); + if (mStatusBarInternal.isGlobalActionsDisabled()) { + return; + } mKeyguardShowing = keyguardShowing; mDeviceProvisioned = deviceProvisioned; mShowing = true; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index db7817ec4955..5d871b3c7baf 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2270,7 +2270,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Only force the default orientation if the screen is xlarge, at least 960dp x 720dp, per // http://developer.android.com/guide/practices/screens_support.html#range - mForceDefaultOrientation = longSizeDp >= 960 && shortSizeDp >= 720 && + // For car, ignore the dp limitation. It's physically impossible to rotate the car's screen + // so if the orientation is forced, we need to respect that no matter what. + boolean isCar = mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE); + mForceDefaultOrientation = ((longSizeDp >= 960 && shortSizeDp >= 720) || isCar) && res.getBoolean(com.android.internal.R.bool.config_forceDefaultOrientation) && // For debug purposes the next line turns this feature off with: // $ adb shell setprop config.override_forced_orient true diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index f1fb3e7b4915..6a5ecfaa7c47 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -20,15 +20,25 @@ import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.UserInfo; +import android.content.IntentFilter; import android.os.Binder; +import android.os.Bundle; import android.os.IBinder; import android.os.IStatsCompanionService; import android.os.IStatsManager; import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; +import android.os.UserManager; import android.util.Slog; +import java.util.ArrayList; +import java.util.List; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.KernelWakelockReader; import com.android.internal.os.KernelWakelockStats; @@ -53,6 +63,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { private final PendingIntent mAnomalyAlarmIntent; private final PendingIntent mPollingAlarmIntent; + private final BroadcastReceiver mAppUpdateReceiver; public StatsCompanionService(Context context) { super(); @@ -63,8 +74,85 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { new Intent(mContext, AnomalyAlarmReceiver.class), 0); mPollingAlarmIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(mContext, PollingAlarmReceiver.class), 0); + mAppUpdateReceiver = new AppUpdateReceiver(); + Slog.w(TAG, "Registered receiver for ACTION_PACKAGE_REPLACE AND ADDED."); } + private final static int[] toIntArray(List<Integer> list){ + int[] ret = new int[list.size()]; + for(int i = 0;i < ret.length;i++) { + ret[i] = list.get(i); + } + return ret; + } + + // Assumes that sStatsdLock is held. + private final void informAllUidsLocked(Context context) throws RemoteException { + UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); + PackageManager pm = context.getPackageManager(); + final List<UserInfo> users = um.getUsers(true); + if (DEBUG) { + Slog.w(TAG, "Iterating over "+users.size() + " profiles."); + } + + List<Integer> uids = new ArrayList(); + List<Integer> versions = new ArrayList(); + List<String> apps = new ArrayList(); + + // Add in all the apps for every user/profile. + for (UserInfo profile : users) { + List<PackageInfo> pi = pm.getInstalledPackagesAsUser(0, profile.id); + for (int j = 0; j < pi.size(); j++) { + if (pi.get(j).applicationInfo != null) { + uids.add(pi.get(j).applicationInfo.uid); + versions.add(pi.get(j).versionCode); + apps.add(pi.get(j).packageName); + } + } + } + sStatsd.informAllUidData(toIntArray(uids), toIntArray(versions), apps.toArray(new + String[apps.size()])); + if (DEBUG) { + Slog.w(TAG, "Sent data for "+uids.size() +" apps"); + } + } + + public final static class AppUpdateReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + Slog.i(TAG, "StatsCompanionService noticed an app was updated."); + synchronized (sStatsdLock) { + if (sStatsd == null) { + Slog.w(TAG, "Could not access statsd to inform it of anomaly alarm firing"); + return; + } + try { + if (intent.getAction().equals(Intent.ACTION_PACKAGE_REMOVED)) { + Bundle b = intent.getExtras(); + int uid = b.getInt(Intent.EXTRA_UID); + boolean replacing = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false); + if (!replacing) { + // Don't bother sending an update if we're right about to get another + // intent for the new version that's added. + PackageManager pm = context.getPackageManager(); + String app = intent.getData().getSchemeSpecificPart(); + sStatsd.informOnePackageRemoved(app, uid); + } + } else { + PackageManager pm = context.getPackageManager(); + Bundle b = intent.getExtras(); + int uid = b.getInt(Intent.EXTRA_UID); + String app = intent.getData().getSchemeSpecificPart(); + PackageInfo pi = pm.getPackageInfo(app, PackageManager.MATCH_ANY_USER); + sStatsd.informOnePackage(app, uid, pi.versionCode); + } + } catch (Exception e) { + Slog.w(TAG, "Failed to inform statsd of an app update", e); + } + } + } + }; + public final static class AnomalyAlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { @@ -275,6 +363,15 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { Slog.e(TAG, "linkToDeath(StatsdDeathRecipient) failed", e); forgetEverything(); } + // Setup broadcast receiver for updates + IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REPLACED); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); + filter.addDataScheme("package"); + mContext.registerReceiverAsUser(mAppUpdateReceiver, UserHandle.ALL, filter, null, + null); + // Pull the latest state of UID->app name, version mapping when statsd starts. + informAllUidsLocked(mContext); } catch (RemoteException e) { Slog.e(TAG, "Failed to inform statsd that statscompanion is ready", e); forgetEverything(); @@ -293,6 +390,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { private void forgetEverything() { synchronized (sStatsdLock) { sStatsd = null; + mContext.unregisterReceiver(mAppUpdateReceiver); cancelAnomalyAlarm(); cancelPollingAlarms(); } diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java index 0884678478f6..b07fe98d806e 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java @@ -77,6 +77,7 @@ public interface StatusBarManagerInternal { void setCurrentUser(int newUserId); + boolean isGlobalActionsDisabled(); void setGlobalActionsListener(GlobalActionsListener listener); void showGlobalActions(); diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index bdfbe48153df..c78a3406d0ac 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java @@ -16,6 +16,8 @@ package com.android.server.statusbar; +import static android.app.StatusBarManager.DISABLE2_GLOBAL_ACTIONS; + import android.app.ActivityThread; import android.app.StatusBarManager; import android.content.ComponentName; @@ -363,6 +365,11 @@ public class StatusBarManagerService extends IStatusBarService.Stub { } @Override + public boolean isGlobalActionsDisabled() { + return (mDisabled2 & DISABLE2_GLOBAL_ACTIONS) != 0; + } + + @Override public void setGlobalActionsListener(GlobalActionsListener listener) { mGlobalActionListener = listener; mGlobalActionListener.onStatusBarConnectedChanged(mBar != null); diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index 6117da7b1a38..c1607e94dd1e 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -1022,20 +1022,6 @@ class TvInputHardwareManager implements TvInputHal.Callback { } } - @Override - public boolean dispatchKeyEventToHdmi(KeyEvent event) throws RemoteException { - synchronized (mImplLock) { - if (mReleased) { - throw new IllegalStateException("Device already released."); - } - } - if (mInfo.getType() != TvInputHardwareInfo.TV_INPUT_TYPE_HDMI) { - return false; - } - // TODO(hdmi): mHdmiClient.sendKeyEvent(event); - return false; - } - private boolean startCapture(Surface surface, TvStreamConfig config) { synchronized (mImplLock) { if (mReleased) { diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 0e68a8f64e5f..0b65b2287bdd 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -119,6 +119,7 @@ import static com.android.server.wm.proto.DisplayProto.WINDOW_CONTAINER; import android.annotation.CallSuper; import android.annotation.NonNull; import android.app.ActivityManager.StackId; +import android.content.pm.PackageManager; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.graphics.Bitmap; @@ -3571,6 +3572,16 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } final int orientation = super.getOrientation(); + boolean isCar = mService.mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE); + if (isCar) { + // In a car, you cannot physically rotate the screen, so it doesn't make sense to + // allow anything but the default orientation. + if (DEBUG_ORIENTATION) Slog.v(TAG_WM, + "Forcing UNSPECIFIED orientation in car. Ignoring " + orientation); + return SCREEN_ORIENTATION_UNSPECIFIED; + } + if (orientation != SCREEN_ORIENTATION_UNSET && orientation != SCREEN_ORIENTATION_BEHIND) { if (DEBUG_ORIENTATION) Slog.v(TAG_WM, diff --git a/services/net/java/android/net/ip/ConnectivityPacketTracker.java b/services/net/java/android/net/ip/ConnectivityPacketTracker.java index 0230f36b6fa0..1925c39e5211 100644 --- a/services/net/java/android/net/ip/ConnectivityPacketTracker.java +++ b/services/net/java/android/net/ip/ConnectivityPacketTracker.java @@ -25,6 +25,7 @@ import android.os.Handler; import android.system.ErrnoException; import android.system.Os; import android.system.PacketSocketAddress; +import android.text.TextUtils; import android.util.Log; import android.util.LocalLog; @@ -59,11 +60,14 @@ public class ConnectivityPacketTracker { private static final boolean DBG = false; private static final String MARK_START = "--- START ---"; private static final String MARK_STOP = "--- STOP ---"; + private static final String MARK_NAMED_START = "--- START (%s) ---"; + private static final String MARK_NAMED_STOP = "--- STOP (%s) ---"; private final String mTag; private final LocalLog mLog; private final BlockingSocketReader mPacketListener; private boolean mRunning; + private String mDisplayName; public ConnectivityPacketTracker(Handler h, NetworkInterface netif, LocalLog log) { final String ifname; @@ -85,14 +89,16 @@ public class ConnectivityPacketTracker { mPacketListener = new PacketListener(h, ifindex, hwaddr, mtu); } - public void start() { + public void start(String displayName) { mRunning = true; + mDisplayName = displayName; mPacketListener.start(); } public void stop() { mPacketListener.stop(); mRunning = false; + mDisplayName = null; } private final class PacketListener extends BlockingSocketReader { @@ -133,16 +139,19 @@ public class ConnectivityPacketTracker { @Override protected void onStart() { - mLog.log(MARK_START); + final String msg = TextUtils.isEmpty(mDisplayName) + ? MARK_START + : String.format(MARK_NAMED_START, mDisplayName); + mLog.log(msg); } @Override protected void onStop() { - if (mRunning) { - mLog.log(MARK_STOP); - } else { - mLog.log(MARK_STOP + " (packet listener stopped unexpectedly)"); - } + String msg = TextUtils.isEmpty(mDisplayName) + ? MARK_STOP + : String.format(MARK_NAMED_STOP, mDisplayName); + if (!mRunning) msg += " (packet listener stopped unexpectedly)"; + mLog.log(msg); } @Override diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java index bc07b8108631..e33f6c99aea8 100644 --- a/services/net/java/android/net/ip/IpManager.java +++ b/services/net/java/android/net/ip/IpManager.java @@ -26,6 +26,7 @@ import android.net.IpPrefix; import android.net.LinkAddress; import android.net.LinkProperties.ProvisioningChange; import android.net.LinkProperties; +import android.net.Network; import android.net.ProxyInfo; import android.net.RouteInfo; import android.net.StaticIpConfiguration; @@ -348,6 +349,16 @@ public class IpManager extends StateMachine { return this; } + public Builder withNetwork(Network network) { + mConfig.mNetwork = network; + return this; + } + + public Builder withDisplayName(String displayName) { + mConfig.mDisplayName = displayName; + return this; + } + public ProvisioningConfiguration build() { return new ProvisioningConfiguration(mConfig); } @@ -362,6 +373,8 @@ public class IpManager extends StateMachine { /* package */ ApfCapabilities mApfCapabilities; /* package */ int mProvisioningTimeoutMs = DEFAULT_TIMEOUT_MS; /* package */ int mIPv6AddrGenMode = INetd.IPV6_ADDR_GEN_MODE_STABLE_PRIVACY; + /* package */ Network mNetwork = null; + /* package */ String mDisplayName = null; public ProvisioningConfiguration() {} // used by Builder @@ -374,6 +387,9 @@ public class IpManager extends StateMachine { mStaticIpConfig = other.mStaticIpConfig; mApfCapabilities = other.mApfCapabilities; mProvisioningTimeoutMs = other.mProvisioningTimeoutMs; + mIPv6AddrGenMode = other.mIPv6AddrGenMode; + mNetwork = other.mNetwork; + mDisplayName = other.mDisplayName; } @Override @@ -388,6 +404,8 @@ public class IpManager extends StateMachine { .add("mApfCapabilities: " + mApfCapabilities) .add("mProvisioningTimeoutMs: " + mProvisioningTimeoutMs) .add("mIPv6AddrGenMode: " + mIPv6AddrGenMode) + .add("mNetwork: " + mNetwork) + .add("mDisplayName: " + mDisplayName) .toString(); } @@ -1441,10 +1459,10 @@ public class IpManager extends StateMachine { @Override public void enter() { // Get the Configuration for ApfFilter from Context - boolean filter802_3Frames = + final boolean filter802_3Frames = mContext.getResources().getBoolean(R.bool.config_apfDrop802_3Frames); - int[] ethTypeBlackList = mContext.getResources().getIntArray( + final int[] ethTypeBlackList = mContext.getResources().getIntArray( R.array.config_apfEthTypeBlackList); mApfFilter = ApfFilter.maybeCreate(mConfiguration.mApfCapabilities, mNetworkInterface, @@ -1456,7 +1474,7 @@ public class IpManager extends StateMachine { } mPacketTracker = createPacketTracker(); - if (mPacketTracker != null) mPacketTracker.start(); + if (mPacketTracker != null) mPacketTracker.start(mConfiguration.mDisplayName); if (mConfiguration.mEnableIPv6 && !startIPv6()) { doImmediateProvisioningFailure(IpManagerEvent.ERROR_STARTING_IPV6); @@ -1470,7 +1488,7 @@ public class IpManager extends StateMachine { return; } - InitialConfiguration config = mConfiguration.mInitialConfig; + final InitialConfiguration config = mConfiguration.mInitialConfig; if ((config != null) && !applyInitialConfig(config)) { // TODO introduce a new IpManagerEvent constant to distinguish this error case. doImmediateProvisioningFailure(IpManagerEvent.ERROR_INVALID_PROVISIONING); diff --git a/services/net/java/android/net/util/SharedLog.java b/services/net/java/android/net/util/SharedLog.java index 343d237f8cd9..bbd3d13efbd6 100644 --- a/services/net/java/android/net/util/SharedLog.java +++ b/services/net/java/android/net/util/SharedLog.java @@ -106,6 +106,10 @@ public class SharedLog { record(Category.NONE, msg); } + public void logf(String fmt, Object... args) { + log(String.format(fmt, args)); + } + public void mark(String msg) { record(Category.MARK, msg); } diff --git a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java index 9fa1d68b8628..0b4d61fb783e 100644 --- a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -19,6 +19,7 @@ import static android.app.Notification.GROUP_ALERT_ALL; import static android.app.Notification.GROUP_ALERT_CHILDREN; import static android.app.Notification.GROUP_ALERT_SUMMARY; import static android.app.NotificationManager.IMPORTANCE_HIGH; +import static android.app.NotificationManager.IMPORTANCE_MIN; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; @@ -57,7 +58,13 @@ import android.provider.Settings; import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import android.util.Slog; +import android.view.accessibility.AccessibilityEvent; +import android.view.accessibility.AccessibilityManager; +import android.view.accessibility.IAccessibilityManager; +import android.view.accessibility.IAccessibilityManagerClient; +import com.android.internal.util.IntPair; import com.android.server.lights.Light; import org.junit.Before; @@ -67,6 +74,8 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; @SmallTest @RunWith(AndroidJUnit4.class) @@ -80,6 +89,8 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { NotificationManagerService.WorkerHandler mHandler; @Mock NotificationUsageStats mUsageStats; + @Mock + IAccessibilityManager mAccessibilityService; private NotificationManagerService mService; private String mPkg = "com.android.server.notification"; @@ -111,17 +122,25 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { private static final int MAX_VIBRATION_DELAY = 1000; @Before - public void setUp() { + public void setUp() throws Exception { MockitoAnnotations.initMocks(this); when(mAudioManager.isAudioFocusExclusive()).thenReturn(false); when(mAudioManager.getRingtonePlayer()).thenReturn(mRingtonePlayer); when(mAudioManager.getStreamVolume(anyInt())).thenReturn(10); when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL); - when(mUsageStats.isAlertRateLimited(any())).thenReturn(false); - mService = new NotificationManagerService(getContext()); + long serviceReturnValue = IntPair.of( + AccessibilityManager.STATE_FLAG_ACCESSIBILITY_ENABLED, + AccessibilityEvent.TYPES_ALL_MASK); + when(mAccessibilityService.addClient(any(), anyInt())).thenReturn(serviceReturnValue); + AccessibilityManager accessibilityManager = + new AccessibilityManager(Handler.getMain(), mAccessibilityService, 0); + verify(mAccessibilityService).addClient(any(IAccessibilityManagerClient.class), anyInt()); + assertTrue(accessibilityManager.isEnabled()); + + mService = spy(new NotificationManagerService(getContext())); mService.setAudioManager(mAudioManager); mService.setVibrator(mVibrator); mService.setSystemReady(true); @@ -130,6 +149,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { mService.setScreenOn(false); mService.setFallbackVibrationPattern(FALLBACK_VIBRATION_PATTERN); mService.setUsageStats(mUsageStats); + mService.setAccessibilityManager(accessibilityManager); } // @@ -381,6 +401,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { verifyBeepLooped(); verifyNeverVibrate(); + verify(mAccessibilityService, times(1)).sendAccessibilityEvent(any(), anyInt()); } @Test @@ -435,6 +456,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { r.isUpdate = true; mService.buzzBeepBlinkLocked(r); verifyBeepLooped(); + verify(mAccessibilityService, times(2)).sendAccessibilityEvent(any(), anyInt()); } @Test @@ -450,6 +472,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { // update should not beep mService.buzzBeepBlinkLocked(s); verifyNeverBeep(); + verify(mAccessibilityService, times(1)).sendAccessibilityEvent(any(), anyInt()); } @Test @@ -547,7 +570,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { mService.mInCall = true; mService.buzzBeepBlinkLocked(r); - //verify(mService, times(1)).playInCallNotification(); + verify(mService, times(1)).playInCallNotification(); verifyNeverBeep(); // doesn't play normal beep } @@ -842,7 +865,6 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { mService.addNotification(r); mService.buzzBeepBlinkLocked(r); - verifyNeverBeep(); } @@ -870,7 +892,6 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { summary.getNotification().flags |= Notification.FLAG_GROUP_SUMMARY; mService.buzzBeepBlinkLocked(summary); - verify(mUsageStats, never()).isAlertRateLimited(any()); } @@ -889,6 +910,30 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { verifyNeverBeep(); } + @Test + public void testA11yMinInitialPost() throws Exception { + NotificationRecord r = getQuietNotification(); + r.setImportance(IMPORTANCE_MIN, ""); + mService.buzzBeepBlinkLocked(r); + verify(mAccessibilityService, never()).sendAccessibilityEvent(any(), anyInt()); + } + + @Test + public void testA11yQuietInitialPost() throws Exception { + NotificationRecord r = getQuietNotification(); + mService.buzzBeepBlinkLocked(r); + verify(mAccessibilityService, times(1)).sendAccessibilityEvent(any(), anyInt()); + } + + @Test + public void testA11yQuietUpdate() throws Exception { + NotificationRecord r = getQuietNotification(); + mService.buzzBeepBlinkLocked(r); + r.isUpdate = true; + mService.buzzBeepBlinkLocked(r); + verify(mAccessibilityService, times(1)).sendAccessibilityEvent(any(), anyInt()); + } + static class VibrateRepeatMatcher implements ArgumentMatcher<VibrationEffect> { private final int mRepeatIndex; diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java index 1f6dda191d91..cc8bd69eac3f 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java @@ -55,10 +55,6 @@ public class ActivityTestsBase { private final Context mContext = InstrumentationRegistry.getContext(); private HandlerThread mHandlerThread; - // Grabbing an instance of {@link WindowManagerService} creates it if not present so this must - // be called at before any tests. - private final WindowManagerService mWms = WindowTestUtils.getWindowManagerService(mContext); - @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -136,7 +132,7 @@ public class ActivityTestsBase { mSupportsSplitScreenMultiWindow = true; mSupportsFreeformWindowManagement = true; mSupportsPictureInPicture = true; - mWindowManager = WindowTestUtils.getWindowManagerService(context); + mWindowManager = WindowTestUtils.getMockWindowManagerService(); } @Override diff --git a/tests/CantSaveState1/Android.mk b/tests/CantSaveState1/Android.mk new file mode 100644 index 000000000000..6e9db6e867e5 --- /dev/null +++ b/tests/CantSaveState1/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_PACKAGE_NAME := CantSaveState1 + +include $(BUILD_PACKAGE) diff --git a/tests/CantSaveState1/AndroidManifest.xml b/tests/CantSaveState1/AndroidManifest.xml new file mode 100644 index 000000000000..fadcaebdeddb --- /dev/null +++ b/tests/CantSaveState1/AndroidManifest.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.test.cantsavestate1"> + <application android:label="Can't Save 1" android:cantSaveState="true"> + <activity android:name="CantSave1Activity"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> +</manifest> diff --git a/tests/CantSaveState1/res/layout/cant_save_1_activity.xml b/tests/CantSaveState1/res/layout/cant_save_1_activity.xml new file mode 100644 index 000000000000..c5bf657c7fb1 --- /dev/null +++ b/tests/CantSaveState1/res/layout/cant_save_1_activity.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" +> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="25dp" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="This app #1 can't save its state" + /> + +</LinearLayout> diff --git a/core/tests/coretests/src/android/print/PrintTestActivity.java b/tests/CantSaveState1/src/com/android/test/cantsavestate2/CantSave1Activity.java index e9b001f3c821..8879ed03e8b4 100644 --- a/core/tests/coretests/src/android/print/PrintTestActivity.java +++ b/tests/CantSaveState1/src/com/android/test/cantsavestate2/CantSave1Activity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * Copyright (C) 2017 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,15 @@ * limitations under the License. */ -package android.print; +package com.android.test.cantsavestate1; import android.app.Activity; import android.os.Bundle; -import android.view.WindowManager; -public class PrintTestActivity extends Activity { +public class CantSave1Activity extends Activity { @Override - protected void onCreate(Bundle savedInstanceState) { + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); + setContentView(R.layout.cant_save_1_activity); } } diff --git a/tests/CantSaveState2/Android.mk b/tests/CantSaveState2/Android.mk new file mode 100644 index 000000000000..add9214e38c7 --- /dev/null +++ b/tests/CantSaveState2/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_PACKAGE_NAME := CantSaveState2 + +include $(BUILD_PACKAGE) diff --git a/tests/CantSaveState2/AndroidManifest.xml b/tests/CantSaveState2/AndroidManifest.xml new file mode 100644 index 000000000000..8f4f01d19fc7 --- /dev/null +++ b/tests/CantSaveState2/AndroidManifest.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.test.cantsavestate2"> + <application android:label="Can't Save 2" android:cantSaveState="true"> + <activity android:name="CantSave2Activity"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> +</manifest> diff --git a/tests/CantSaveState2/res/layout/cant_save_2_activity.xml b/tests/CantSaveState2/res/layout/cant_save_2_activity.xml new file mode 100644 index 000000000000..c5b8e3d8bcd3 --- /dev/null +++ b/tests/CantSaveState2/res/layout/cant_save_2_activity.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" +> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="25dp" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="This app #2 can't save its state" + /> + +</LinearLayout> diff --git a/tests/CantSaveState2/src/com/android/test/cantsavestate2/CantSave2Activity.java b/tests/CantSaveState2/src/com/android/test/cantsavestate2/CantSave2Activity.java new file mode 100644 index 000000000000..3ce63c77a881 --- /dev/null +++ b/tests/CantSaveState2/src/com/android/test/cantsavestate2/CantSave2Activity.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.test.cantsavestate2; + +import android.app.Activity; +import android.os.Bundle; + +public class CantSave2Activity extends Activity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.cant_save_2_activity); + } +} diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java index 82104034ca6e..163250d9d666 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java @@ -296,6 +296,7 @@ public class NotificationTestList extends TestActivity Notification n = new Notification.Builder(NotificationTestList.this, "min") .setSmallIcon(R.drawable.icon2) .setContentTitle("Min priority") + .setTicker("Min priority") .build(); mNM.notify("min", 7000, n); } @@ -306,6 +307,7 @@ public class NotificationTestList extends TestActivity Notification n = new Notification.Builder(NotificationTestList.this, "low") .setSmallIcon(R.drawable.icon2) .setContentTitle("Low priority") + .setTicker("Low priority") .build(); mNM.notify("low", 7002, n); } @@ -326,6 +328,7 @@ public class NotificationTestList extends TestActivity Notification n = new Notification.Builder(NotificationTestList.this, "high") .setSmallIcon(R.drawable.icon2) .setContentTitle("High priority") + .setTicker("High priority") .build(); mNM.notify("high", 7006, n); } diff --git a/tools/streaming_proto/Android.bp b/tools/streaming_proto/Android.bp index 24068e9ffe92..756549c5e880 100644 --- a/tools/streaming_proto/Android.bp +++ b/tools/streaming_proto/Android.bp @@ -17,13 +17,31 @@ // ========================================================== // Build the host executable: protoc-gen-javastream // ========================================================== -cc_binary_host { - name: "protoc-gen-javastream", +cc_defaults { + name: "protoc-gen-stream-defaults", srcs: [ "Errors.cpp", "string_utils.cpp", - "main.cpp", + ], +} + + +cc_binary_host { + name: "protoc-gen-javastream", + srcs: [ + "java/main.cpp", + ], + + defaults: ["protoc-gen-stream-defaults"], + shared_libs: ["libprotoc"], +} + +cc_binary_host { + name: "protoc-gen-cppstream", + srcs: [ + "cpp/main.cpp", ], + defaults: ["protoc-gen-stream-defaults"], shared_libs: ["libprotoc"], } diff --git a/tools/streaming_proto/Errors.cpp b/tools/streaming_proto/Errors.cpp index 91c6b9245de0..0cd9037dcb55 100644 --- a/tools/streaming_proto/Errors.cpp +++ b/tools/streaming_proto/Errors.cpp @@ -3,7 +3,7 @@ #include <stdlib.h> namespace android { -namespace javastream_proto { +namespace stream_proto { Errors ERRORS; @@ -82,6 +82,6 @@ Errors::HasErrors() const return m_errors.size() > 0; } -} // namespace javastream_proto +} // namespace stream_proto } // namespace android diff --git a/tools/streaming_proto/Errors.h b/tools/streaming_proto/Errors.h index 109195a20b06..f14bbfd55b5f 100644 --- a/tools/streaming_proto/Errors.h +++ b/tools/streaming_proto/Errors.h @@ -4,7 +4,7 @@ #include <vector> namespace android { -namespace javastream_proto { +namespace stream_proto { using namespace std; @@ -44,5 +44,5 @@ extern const string UNKNOWN_FILE; extern const int UNKNOWN_LINE; -} // namespace javastream_proto +} // namespace stream_proto } // namespace android diff --git a/tools/streaming_proto/cpp/main.cpp b/tools/streaming_proto/cpp/main.cpp new file mode 100644 index 000000000000..d4e1b7aede92 --- /dev/null +++ b/tools/streaming_proto/cpp/main.cpp @@ -0,0 +1,273 @@ +#include "Errors.h" +#include "string_utils.h" + +#include "google/protobuf/compiler/plugin.pb.h" +#include "google/protobuf/io/zero_copy_stream_impl.h" +#include "google/protobuf/text_format.h" + +#include <iomanip> +#include <iostream> +#include <sstream> + +using namespace android::stream_proto; +using namespace google::protobuf; +using namespace google::protobuf::compiler; +using namespace google::protobuf::io; +using namespace std; + +/** + * Position of the field type in a (long long) fieldId. + */ +const uint64_t FIELD_TYPE_SHIFT = 32; + +// +// FieldId flags for whether the field is single, repeated or packed. +// TODO: packed is not supported yet. +// +const uint64_t FIELD_COUNT_SHIFT = 40; +const uint64_t FIELD_COUNT_MASK = 0x0fULL << FIELD_COUNT_SHIFT; +const uint64_t FIELD_COUNT_UNKNOWN = 0; +const uint64_t FIELD_COUNT_SINGLE = 1ULL << FIELD_COUNT_SHIFT; +const uint64_t FIELD_COUNT_REPEATED = 2ULL << FIELD_COUNT_SHIFT; +const uint64_t FIELD_COUNT_PACKED = 4ULL << FIELD_COUNT_SHIFT; + +// Indent +const string INDENT = " "; + +/** + * See if this is the file for this request, and not one of the imported ones. + */ +static bool +should_generate_for_file(const CodeGeneratorRequest& request, const string& file) +{ + const int N = request.file_to_generate_size(); + for (int i=0; i<N; i++) { + if (request.file_to_generate(i) == file) { + return true; + } + } + return false; +} + +static string +make_filename(const FileDescriptorProto& file_descriptor) +{ + return file_descriptor.name() + ".h"; +} + +static string +get_proto_type(const FieldDescriptorProto& field) +{ + switch (field.type()) { + case FieldDescriptorProto::TYPE_DOUBLE: + return "double"; + case FieldDescriptorProto::TYPE_FLOAT: + return "float"; + case FieldDescriptorProto::TYPE_INT64: + return "int64"; + case FieldDescriptorProto::TYPE_UINT64: + return "uint64"; + case FieldDescriptorProto::TYPE_INT32: + return "int32"; + case FieldDescriptorProto::TYPE_FIXED64: + return "fixed64"; + case FieldDescriptorProto::TYPE_FIXED32: + return "fixed32"; + case FieldDescriptorProto::TYPE_BOOL: + return "bool"; + case FieldDescriptorProto::TYPE_STRING: + return "string"; + case FieldDescriptorProto::TYPE_GROUP: + return "group<unsupported!>"; + case FieldDescriptorProto::TYPE_MESSAGE: + return field.type_name(); + case FieldDescriptorProto::TYPE_BYTES: + return "bytes"; + case FieldDescriptorProto::TYPE_UINT32: + return "uint32"; + case FieldDescriptorProto::TYPE_ENUM: + return field.type_name(); + case FieldDescriptorProto::TYPE_SFIXED32: + return "sfixed32"; + case FieldDescriptorProto::TYPE_SFIXED64: + return "sfixed64"; + case FieldDescriptorProto::TYPE_SINT32: + return "sint32"; + case FieldDescriptorProto::TYPE_SINT64: + return "sint64"; + default: + // won't happen + return "void"; + } +} + +static void +write_enum(stringstream& text, const EnumDescriptorProto& enu, const string& indent) +{ + const int N = enu.value_size(); + text << indent << "// enum " << enu.name() << endl; + for (int i=0; i<N; i++) { + const EnumValueDescriptorProto& value = enu.value(i); + text << indent << "const uint32_t " + << make_constant_name(value.name()) + << " = " << value.number() << ";" << endl; + } + text << endl; +} + +static uint64_t +get_field_id(const FieldDescriptorProto& field) +{ + // Number + uint64_t result = (uint64_t)field.number(); + + // Type + result |= (uint64_t)field.type() << FIELD_TYPE_SHIFT; + + // Count + if (field.options().packed()) { + result |= FIELD_COUNT_PACKED; + } else if (field.label() == FieldDescriptorProto::LABEL_REPEATED) { + result |= FIELD_COUNT_REPEATED; + } else { + result |= FIELD_COUNT_SINGLE; + } + + return result; +} + +static void +write_field(stringstream& text, const FieldDescriptorProto& field, const string& indent) +{ + string optional_comment = field.label() == FieldDescriptorProto::LABEL_OPTIONAL + ? "optional " : ""; + string repeated_comment = field.label() == FieldDescriptorProto::LABEL_REPEATED + ? "repeated " : ""; + string proto_type = get_proto_type(field); + string packed_comment = field.options().packed() + ? " [packed=true]" : ""; + text << indent << "// " << optional_comment << repeated_comment << proto_type << ' ' + << field.name() << " = " << field.number() << packed_comment << ';' << endl; + + text << indent << "const uint64_t " << make_constant_name(field.name()) << " = 0x"; + + ios::fmtflags fmt(text.flags()); + text << setfill('0') << setw(16) << hex << get_field_id(field); + text.flags(fmt); + + text << "LL;" << endl; + + text << endl; +} + +static void +write_message(stringstream& text, const DescriptorProto& message, const string& indent) +{ + int N; + const string indented = indent + INDENT; + + text << indent << "// message " << message.name() << endl; + text << indent << "class " << message.name() << " {" << endl; + text << indent << "public:" << endl; + + // Enums + N = message.enum_type_size(); + for (int i=0; i<N; i++) { + write_enum(text, message.enum_type(i), indented); + } + + // Nested classes + N = message.nested_type_size(); + for (int i=0; i<N; i++) { + write_message(text, message.nested_type(i), indented); + } + + // Fields + N = message.field_size(); + for (int i=0; i<N; i++) { + write_field(text, message.field(i), indented); + } + + text << indent << "};" << endl; + text << endl; +} + +static void +write_cpp_file(CodeGeneratorResponse* response, const FileDescriptorProto& file_descriptor) +{ + stringstream text; + + text << "// Generated by protoc-gen-cppstream. DO NOT MODIFY." << endl; + text << "// source: " << file_descriptor.name() << endl << endl; + + string header = "ANDROID_" + replace_string(file_descriptor.name(), '/', '_'); + header = replace_string(header, '.', '_') + "_stream_h"; + header = make_constant_name(header); + + text << "#ifndef " << header << endl; + text << "#define " << header << endl; + text << endl; + + vector<string> namespaces = split(file_descriptor.package(), '.'); + for (vector<string>::iterator it = namespaces.begin(); it != namespaces.end(); it++) { + text << "namespace " << *it << " {" << endl; + } + text << endl; + + size_t N; + N = file_descriptor.enum_type_size(); + for (size_t i=0; i<N; i++) { + write_enum(text, file_descriptor.enum_type(i), ""); + } + + N = file_descriptor.message_type_size(); + for (size_t i=0; i<N; i++) { + write_message(text, file_descriptor.message_type(i), ""); + } + + for (vector<string>::iterator it = namespaces.begin(); it != namespaces.end(); it++) { + text << "} // " << *it << endl; + } + + text << endl; + text << "#endif // " << header << endl; + + CodeGeneratorResponse::File* file_response = response->add_file(); + file_response->set_name(make_filename(file_descriptor)); + file_response->set_content(text.str()); +} + +int main(int argc, char const *argv[]) +{ + (void)argc; + (void)argv; + + GOOGLE_PROTOBUF_VERIFY_VERSION; + + CodeGeneratorRequest request; + CodeGeneratorResponse response; + + // Read the request + request.ParseFromIstream(&cin); + + // Build the files we need. + const int N = request.proto_file_size(); + for (int i=0; i<N; i++) { + const FileDescriptorProto& file_descriptor = request.proto_file(i); + if (should_generate_for_file(request, file_descriptor.name())) { + write_cpp_file(&response, file_descriptor); + } + } + + // If we had errors, don't write the response. Print the errors and exit. + if (ERRORS.HasErrors()) { + ERRORS.Print(); + return 1; + } + + // If we didn't have errors, write the response and exit happily. + response.SerializeToOstream(&cout); + + /* code */ + return 0; +}
\ No newline at end of file diff --git a/tools/streaming_proto/main.cpp b/tools/streaming_proto/java/main.cpp index 5b4ba04b2b58..b7d594bb9465 100644 --- a/tools/streaming_proto/main.cpp +++ b/tools/streaming_proto/java/main.cpp @@ -12,7 +12,7 @@ #include <sstream> #include <map> -using namespace android::javastream_proto; +using namespace android::stream_proto; using namespace google::protobuf; using namespace google::protobuf::compiler; using namespace google::protobuf::io; diff --git a/tools/streaming_proto/string_utils.cpp b/tools/streaming_proto/string_utils.cpp index cc738c4c108e..bd34ab7aa44d 100644 --- a/tools/streaming_proto/string_utils.cpp +++ b/tools/streaming_proto/string_utils.cpp @@ -3,7 +3,7 @@ #include <iostream> namespace android { -namespace javastream_proto { +namespace stream_proto { using namespace std; @@ -89,7 +89,26 @@ replace_string(const string& str, const char replace, const char with) return result; } -} // namespace javastream_proto +vector<string> +split(const string& str, const char delimiter) +{ + vector<string> result; + size_t base = 0, found = 0; + while (true) { + found = str.find_first_of(delimiter, base); + if (found != base) { + string part = str.substr(base, found - base); + if (!part.empty()) { + result.push_back(part); + } + } + if (found == str.npos) break; + base = found + 1; + } + return result; +} + +} // namespace stream_proto } // namespace android diff --git a/tools/streaming_proto/string_utils.h b/tools/streaming_proto/string_utils.h index ffe83ca99704..03284d16e1be 100644 --- a/tools/streaming_proto/string_utils.h +++ b/tools/streaming_proto/string_utils.h @@ -1,7 +1,8 @@ #include <string> +#include <vector> namespace android { -namespace javastream_proto { +namespace stream_proto { using namespace std; @@ -26,7 +27,11 @@ string file_base_name(const string& str); */ string replace_string(const string& str, const char replace, const char with); +/** + * Split a string to parts by delimiter. + */ +vector<string> split(const string& str, const char delimiter); -} // namespace javastream_proto +} // namespace stream_proto } // namespace android |