OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
Adrian Roos [Wed, 23 Aug 2017 17:26:03 +0000 (17:26 +0000)]
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
am: 07168bf44b

Change-Id: Iaaf4c696269279b5ad3c2489a636450ead02f475

7 years agoMerge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694
Hall Liu [Wed, 23 Aug 2017 17:16:04 +0000 (17:16 +0000)]
Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786 am: 7754e25694
am: a7bb0ffc7d

Change-Id: Iab7c397dba3fb446e0c03cd1bab0e82de8172577

7 years agoMerge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 17:12:27 +0000 (17:12 +0000)]
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev

7 years agoMerge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
Hall Liu [Wed, 23 Aug 2017 17:05:57 +0000 (17:05 +0000)]
Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
am: 7754e25694

Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc

7 years agoMerge "Embms API adjustments for 7/21" am: 489dcb7cca
Hall Liu [Wed, 23 Aug 2017 16:56:26 +0000 (16:56 +0000)]
Merge "Embms API adjustments for 7/21" am: 489dcb7cca
am: 488d3bf786

Change-Id: I03ca7bd2734b5410c37b23ba2e8d33d722ad7ebf

7 years agoMerge "Embms API adjustments for 7/21"
Hall Liu [Wed, 23 Aug 2017 16:44:01 +0000 (16:44 +0000)]
Merge "Embms API adjustments for 7/21"
am: 489dcb7cca

Change-Id: Ia0b3e9908878c2053c25753b8d393070c2c48a0e

7 years agoMerge "Embms API adjustments for 7/21"
Hall Liu [Wed, 23 Aug 2017 16:37:50 +0000 (16:37 +0000)]
Merge "Embms API adjustments for 7/21"

7 years agoMerge "Check a11y enabled before sending events from PiP" into oc-mr1-dev
Phil Weaver [Wed, 23 Aug 2017 16:24:01 +0000 (16:24 +0000)]
Merge "Check a11y enabled before sending events from PiP" into oc-mr1-dev
am: 4329f8ee97

Change-Id: I0a17082c0e566fb7a4efea62545f1727328aed9d

7 years agoMerge "Check a11y enabled before sending events from PiP" into oc-mr1-dev
Phil Weaver [Wed, 23 Aug 2017 16:14:02 +0000 (16:14 +0000)]
Merge "Check a11y enabled before sending events from PiP" into oc-mr1-dev

7 years agoMerge "Transforming all texts of decorated media custom views" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 16:07:49 +0000 (16:07 +0000)]
Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am: 60a09546c0

Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b

7 years agoMerge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev
Beverly Tai [Wed, 23 Aug 2017 15:59:51 +0000 (15:59 +0000)]
Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev
am: f7964b1513

Change-Id: I4f7cc636c3c1cf84de3963947730ac56147131aa

7 years agoMerge "Transforming all texts of decorated media custom views" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 15:55:41 +0000 (15:55 +0000)]
Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev

7 years agoMerge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev
Beverly Tai [Wed, 23 Aug 2017 15:50:30 +0000 (15:50 +0000)]
Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev

7 years agoAOD: Fix crash when AOD is stopped immediately after starting
Adrian Roos [Tue, 22 Aug 2017 13:42:12 +0000 (15:42 +0200)]
AOD: Fix crash when AOD is stopped immediately after starting

Fixes an issue where the screen state was set after DozeService was already
destroyed, causing a crash.

Change-Id: I13ff590b62f905330ccb438692410e118b76c242
Fixes: 64907936
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java

7 years agoMerge "Fix issue with app not becoming visible" into oc-mr1-dev
Jorim Jaggi [Wed, 23 Aug 2017 11:23:29 +0000 (11:23 +0000)]
Merge "Fix issue with app not becoming visible" into oc-mr1-dev
am: af6a558327

Change-Id: I7c33b554fc3ea8fa074afb0eb8a0631801208e61

7 years agoMerge "Fix issue with app not becoming visible" into oc-mr1-dev
Jorim Jaggi [Wed, 23 Aug 2017 11:13:28 +0000 (11:13 +0000)]
Merge "Fix issue with app not becoming visible" into oc-mr1-dev

7 years agoFix issue with app not becoming visible
Jorim Jaggi [Tue, 22 Aug 2017 12:55:17 +0000 (14:55 +0200)]
Fix issue with app not becoming visible

If an activity was started on top of Keyguard but didn't have
FLAG_SHOW_WHEN_LOCKED set yet, topRunningActivityLocked was
the activity, so we called minimalResumeActivity with the activity
but the activity wasn't made visible because
checkKeyguardVisibility returned false. Then, r.visible was set
to true without actually informing window manager about the
visibility change, which wasn't corrected in
resumeTopActivityInnerLocked because r.visible was already set to
true.

Then, it's windows were stuck in READY_TO_SHOW state because the
token was never made visible.

Fix this by informing by informing WM about visibilility change in
completeResumeLocked. This is a no-op if visibility was already
correct.

I belive this regression was originally caused from
I745e985766a1af97203e1d22b6443dabdd0c0363

Test: go/wm-smoke
Test: Set dream from "Timely Alarm Clock", wait until dreaming,
then adb shell am start -n
ch.bitspin.timely/ch.bitspin.timely.activity.SnoozeActivity_

Change-Id: Idbd47086885c3536fa01ab249309ebe37203ba0b
Fixes: 62373472

7 years agoMerge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev
Makoto Onuki [Wed, 23 Aug 2017 10:14:23 +0000 (10:14 +0000)]
Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev
am: ac1924ce18

Change-Id: I28c844b69323c1c3a304865ebd942f09c22ef585

7 years agoMerge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 10:07:39 +0000 (10:07 +0000)]
Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev

7 years agoMerge "Fix transitioning between non-accept strict policies." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 09:20:51 +0000 (09:20 +0000)]
Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev
am: a68cdbe7b1

Change-Id: Ic14d486ddd9f7ca2c5b31a79c48a88e0021bfd27

7 years agoMerge "Fix transitioning between non-accept strict policies." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 09:08:46 +0000 (09:08 +0000)]
Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev

7 years agoMerge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 05:53:33 +0000 (05:53 +0000)]
Merge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev
am: 9b601f2066

Change-Id: I7fc47e60b2da5f39c26fb22c1325618f9948dd38

7 years agoMerge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 05:46:34 +0000 (05:46 +0000)]
Merge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev

7 years agoMerge "Fixed a bug with app provided media spans" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 04:10:55 +0000 (04:10 +0000)]
Merge "Fixed a bug with app provided media spans" into oc-mr1-dev
am: 3c47a11598

Change-Id: I874b39c9c76b13579f94b047a269e47602bda72d

7 years agoMerge "Fixed a bug with app provided media spans" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 04:04:54 +0000 (04:04 +0000)]
Merge "Fixed a bug with app provided media spans" into oc-mr1-dev

7 years agoMerge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
Daniel Colascione [Wed, 23 Aug 2017 03:54:08 +0000 (03:54 +0000)]
Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
am: ea7a45eb43

Change-Id: I95f60dc9be2a837de985bc26dd67d20b8efe70d8

7 years agoMerge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
Daniel Colascione [Wed, 23 Aug 2017 03:45:14 +0000 (03:45 +0000)]
Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev

7 years agoTransforming all texts of decorated media custom views
Selim Cinek [Sat, 19 Aug 2017 01:53:44 +0000 (18:53 -0700)]
Transforming all texts of decorated media custom views

Since otherwise they would be illegible with the color
tranformation.

Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes: 64810767
Test: manual, add decoratedMediaCustomView

7 years agoMerge "Fix activity manager timeout during shutdown" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 02:25:41 +0000 (02:25 +0000)]
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev
am: bc06e43c49

Change-Id: I612edfe64cee0f0a192f56177fc7dff8d7ad9e2c

7 years agoMerge "make sure package info is non-null" into oc-mr1-dev
Todd Kennedy [Wed, 23 Aug 2017 02:11:25 +0000 (02:11 +0000)]
Merge "make sure package info is non-null" into oc-mr1-dev
am: 63b3eff31a

Change-Id: Ic710dd55d0ed1dbc95d70fe480dc9060b661c051

7 years agoMerge "Fix activity manager timeout during shutdown" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 01:58:36 +0000 (01:58 +0000)]
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev

7 years agoMerge "Only use WM screen rotation animation on default display" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 01:53:47 +0000 (01:53 +0000)]
Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev
am: f394ac4eba

Change-Id: I6518a549ae00e5f06907d01a1337a09b2e2c4614

7 years agoMerge "make sure package info is non-null" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 01:51:12 +0000 (01:51 +0000)]
Merge "make sure package info is non-null" into oc-mr1-dev

7 years agoMerge "Image: fix typo" into oc-mr1-dev
Yin-Chia Yeh [Wed, 23 Aug 2017 01:29:29 +0000 (01:29 +0000)]
Merge "Image: fix typo" into oc-mr1-dev
am: ad3a36b13b

Change-Id: I701cdbd6f46e88e5d0c95073a2d86a65a73c2258

7 years agoMerge "Only use WM screen rotation animation on default display" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 01:28:20 +0000 (01:28 +0000)]
Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev

7 years agoMerge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev
Lucas Dupin [Wed, 23 Aug 2017 01:23:54 +0000 (01:23 +0000)]
Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev
am: f00b496b4d

Change-Id: Iee45882aa11644046c374a7715b2ad836fb85d43

7 years agoMerge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 01:13:20 +0000 (01:13 +0000)]
Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
am: 0e261a68d2

Change-Id: Ia87d5fce1444602f9d65e3f1c8ace960d25e8d01

7 years agoMerge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev
Svetoslav Ganov [Wed, 23 Aug 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev
am: 7e73c70fce

Change-Id: Ib9695b7707d8a1e9c093bd14e6470db8981f2e8b

7 years agoMerge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
Beverly [Wed, 23 Aug 2017 00:50:51 +0000 (00:50 +0000)]
Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
am: 0951dbd00d

Change-Id: I0658524b2f0d260ec2dda57f0f44f52cd312fd16

7 years agoMerge "Image: fix typo" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 00:20:12 +0000 (00:20 +0000)]
Merge "Image: fix typo" into oc-mr1-dev

7 years agoEmbms API adjustments for 7/21
Hall Liu [Thu, 20 Jul 2017 22:32:51 +0000 (15:32 -0700)]
Embms API adjustments for 7/21

* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e

7 years agoMerge "Only log resolution when starting activities" into oc-mr1-dev
Todd Kennedy [Wed, 23 Aug 2017 00:06:45 +0000 (00:06 +0000)]
Merge "Only log resolution when starting activities" into oc-mr1-dev
am: e4de49140d

Change-Id: Ia86f2d6097877e894fed40f12c5c49f26a1b690d

7 years agoMerge "Merge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a...
Android Build Merger (Role) [Wed, 23 Aug 2017 00:01:51 +0000 (00:01 +0000)]
Merge "Merge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a am: 4f5ce75cbd am: 01f9244e81 am: ff82f33915" into oc-mr1-dev-plus-aosp

7 years agoMerge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a am...
Aurimas Liutikas [Tue, 22 Aug 2017 23:57:58 +0000 (23:57 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a am: 4f5ce75cbd am: 01f9244e81
am: ff82f33915

Change-Id: I264da4ad2d7664f82c8934ead7f5644498610a99

7 years agoMerge "Merge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83...
Android Build Merger (Role) [Tue, 22 Aug 2017 23:55:34 +0000 (23:55 +0000)]
Merge "Merge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83 am: 0e3b00f8b3 am: 066f35d10b" into oc-mr1-dev-plus-aosp

7 years agoMerge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 23:54:18 +0000 (23:54 +0000)]
Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev

7 years agoMerge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83 am:...
Amit Mahajan [Tue, 22 Aug 2017 23:47:14 +0000 (23:47 +0000)]
Merge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83 am: 0e3b00f8b3
am: 066f35d10b

Change-Id: If3a99426b3b287c54f01526a0f70b3cd239cd899

7 years agoMerge "Allow clearing instant app meta-data" into oc-mr1-dev
Svet Ganov [Tue, 22 Aug 2017 23:39:07 +0000 (23:39 +0000)]
Merge "Allow clearing instant app meta-data" into oc-mr1-dev
am: e391175330

Change-Id: I35fea7acf6bd4084b06cb17c580c75df08ef484c

7 years agoMerge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a am...
Aurimas Liutikas [Tue, 22 Aug 2017 23:38:44 +0000 (23:38 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a am: 4f5ce75cbd
am: 01f9244e81

Change-Id: I878b8ec0564de9bff7fd8e3f507f2a6a7a07e7db

7 years agoMerge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83
Amit Mahajan [Tue, 22 Aug 2017 23:30:25 +0000 (23:30 +0000)]
Merge "Make dun APNs as read-only by default." am: 6645fdad68 am: be8044de83
am: 0e3b00f8b3

Change-Id: I61cdd3c5c8fba049c6a3748dde196fe232ece20b

7 years agoFixed a bug with app provided media spans
Selim Cinek [Fri, 18 Aug 2017 23:17:51 +0000 (16:17 -0700)]
Fixed a bug with app provided media spans

Since notifications are colorized now,
We need to clear color spans from media
notifications, otherwise the contrast won't
be ensured.

Test: use media notification with color span, observe no span
Fixes: 64445955
Change-Id: Ib4f5b14196c604468c8c00ba48f294b1b2d102e3

7 years agoMerge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
Selim Cinek [Tue, 22 Aug 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev

7 years agoMerge "Fixed a bug with decorated custom views" into oc-mr1-dev
Selim Cinek [Tue, 22 Aug 2017 23:20:24 +0000 (23:20 +0000)]
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
am: 9d41e8cd47

Change-Id: I36099788ad09bb8035374c2ca27caffabc21dfb0

7 years agoMerge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev
Svetoslav Ganov [Tue, 22 Aug 2017 23:12:25 +0000 (23:12 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev

7 years agoMerge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev
Lucas Dupin [Tue, 22 Aug 2017 23:12:07 +0000 (23:12 +0000)]
Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev
am: 3edfdf345e

Change-Id: I49871d0872e6b4f8194d3425a59cd5661b5623b7

7 years agoFix activity manager timeout during shutdown
David Stevens [Thu, 17 Aug 2017 21:55:47 +0000 (14:55 -0700)]
Fix activity manager timeout during shutdown

Flip the return value for ActivityStack.goToSleepIfPossible from true if
something needs to be done to true if the stack successfully went to
sleep. An incorrect check in ActivityStack.checkReadyForSleep was
causing ActivityStackSupervisor to sometimes not get notified when a
stack finished stopping during shutdown. Also, no-delay calls to
ActivityStackSupervisor#checkReadyForSleepLocked would fail to put
activities to sleep.

BUG: 64756886
Test: go/run-boottest
Change-Id: Icec590ed9a0e0f035881b7eb03a280787dcfced1

7 years agoMerge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 23:01:21 +0000 (23:01 +0000)]
Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev

7 years agoMerge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc...
Nate Fischer [Tue, 22 Aug 2017 23:01:12 +0000 (23:01 +0000)]
Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev
am: b2456e6194

Change-Id: I3066dd0edd6c125b2e7fdab7fc07624f4c8688a5

7 years agoMerge "Only log resolution when starting activities" into oc-mr1-dev
Todd Kennedy [Tue, 22 Aug 2017 23:00:58 +0000 (23:00 +0000)]
Merge "Only log resolution when starting activities" into oc-mr1-dev

7 years agoMerge "Allow clearing instant app meta-data" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:49:03 +0000 (22:49 +0000)]
Merge "Allow clearing instant app meta-data" into oc-mr1-dev

7 years agoMerge "Fixed a bug with decorated custom views" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:48:14 +0000 (22:48 +0000)]
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev

7 years agoMerge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a
Aurimas Liutikas [Tue, 22 Aug 2017 22:48:13 +0000 (22:48 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am: 899398113a
am: 4f5ce75cbd

Change-Id: I85128958ed4e882cb996767f2abbb2146bf0fb3d

7 years agoMerge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:42:57 +0000 (22:42 +0000)]
Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev

7 years agoMerge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc...
Nate Fischer [Tue, 22 Aug 2017 22:40:39 +0000 (22:40 +0000)]
Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev

7 years agoMerge "Enable Checkstyle for "repo upload" for more projects."
Aurimas Liutikas [Tue, 22 Aug 2017 22:30:37 +0000 (22:30 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
am: 899398113a

Change-Id: Ie9887a55bbdde8bf978e6711b258846f35e2383c

7 years agoMerge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev
Lorenzo Colitti [Tue, 22 Aug 2017 22:19:36 +0000 (22:19 +0000)]
Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev
am: 45fb339d83

Change-Id: I61786d61fe1422e429c0dd9eadaff6f02eb850e7

7 years agoMerge "Enable Checkstyle for "repo upload" for more projects."
Treehugger Robot [Tue, 22 Aug 2017 22:19:28 +0000 (22:19 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."

7 years agoMerge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev
Lorenzo Colitti [Tue, 22 Aug 2017 22:06:46 +0000 (22:06 +0000)]
Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev

7 years agoFixed a bug where the colorization was lost when reinflating
Selim Cinek [Thu, 17 Aug 2017 23:42:51 +0000 (16:42 -0700)]
Fixed a bug where the colorization was lost when reinflating

Because we're reloading the drawable, it's colorfilter was lost.
Let's make sure we're reapplying any tints that we had when doing so.

Test: add colorized notification, reinflate
Change-Id: I11e59636317eb65da5573529f0dd44571ca10cce
Fixes: 63901744

7 years agoFixed a bug with decorated custom views
Selim Cinek [Thu, 17 Aug 2017 00:50:20 +0000 (17:50 -0700)]
Fixed a bug with decorated custom views

Even if their layout still maches, the content was unrecoverably
destroyed, so we can't just reapply it anymore.

Fixes: 62911941
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java

Change-Id: I3a50c96484686958570ac5e4949df3ad4b8a421a

7 years agoEnable Checkstyle for "repo upload" for more projects.
Aurimas Liutikas [Fri, 28 Apr 2017 21:30:26 +0000 (14:30 -0700)]
Enable Checkstyle for "repo upload" for more projects.

This CL enables Checkstyle for the following directories:
- core/java/android/
- core/tests/coretests/src/android/

Bug: 34746646
Test: None
Change-Id: Ib8b3f198000be19e9a7a61aa5abd61d827454eba
(cherry picked from commit e5abb866a56582ffc705c261a2cab20c2331e6a3)

7 years agomake sure package info is non-null
Todd Kennedy [Tue, 22 Aug 2017 17:48:18 +0000 (10:48 -0700)]
make sure package info is non-null

Change-Id: Ib867075a79712de36c46f862d13e5fc1d0958f00
Fixes: 64812776
Test: manual

7 years agoUse /proc/pid/smaps_rollup when available
Daniel Colascione [Thu, 27 Jul 2017 10:33:34 +0000 (03:33 -0700)]
Use /proc/pid/smaps_rollup when available

smaps_rollup saves CPU time by having the kernel sum smaps fields
before formatting each VMA's smaps; this way, user-space gets a single
dummy smaps entry with pre-summed fields, making it much less
expensive to measure PSS of large processes.

This change makes the Android framework attempt to use smaps_rollup
when available; we fall back to regular smaps when it isn't.

Test: pssbench; see log message about using smaps_rollup
Bug: 63439864
Change-Id: I66e207b02626e3287791e1348f35f58a8d94efe9

7 years agoMerge "Use the installer package name for broadcasts" into oc-mr1-dev
Todd Kennedy [Tue, 22 Aug 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Use the installer package name for broadcasts" into oc-mr1-dev
am: 0862898a34

Change-Id: Ie36d31dd4143695485b731a5446dd6b35866bd50

7 years agoMerge "Use the installer package name for broadcasts" into oc-mr1-dev
Todd Kennedy [Tue, 22 Aug 2017 20:27:12 +0000 (20:27 +0000)]
Merge "Use the installer package name for broadcasts" into oc-mr1-dev

7 years agoMerge "Make dun APNs as read-only by default." am: 6645fdad68
Amit Mahajan [Tue, 22 Aug 2017 20:19:41 +0000 (20:19 +0000)]
Merge "Make dun APNs as read-only by default." am: 6645fdad68
am: be8044de83

Change-Id: I4a1c985a165ba0337216e3d873ad3c863a1e4d0b

7 years agoMerge "Make dun APNs as read-only by default."
Amit Mahajan [Tue, 22 Aug 2017 20:05:43 +0000 (20:05 +0000)]
Merge "Make dun APNs as read-only by default."
am: 6645fdad68

Change-Id: I5ed21994ef8719aa125cf20ede49b4e6c48c8c53

7 years agoMerge "Make dun APNs as read-only by default."
Treehugger Robot [Tue, 22 Aug 2017 19:52:22 +0000 (19:52 +0000)]
Merge "Make dun APNs as read-only by default."

7 years agoMerge "Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev am...
Android Build Merger (Role) [Tue, 22 Aug 2017 19:38:09 +0000 (19:38 +0000)]
Merge "Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev am: a743c01d00" into oc-mr1-dev-plus-aosp

7 years agoMerge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev
Bernardo Rufino [Tue, 22 Aug 2017 19:33:15 +0000 (19:33 +0000)]
Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev
am: a743c01d00

Change-Id: I9f63fb00c2bb7aa1ebd99578ce4ab8782741e85d

7 years agoHides non-system overlays on USB debugging dialog.
Beverly [Tue, 22 Aug 2017 19:31:04 +0000 (15:31 -0400)]
Hides non-system overlays on USB debugging dialog.

This is necessary since some apps may use overlays that cannot be
seen. This prevents those overlays from preventing the USB dialog
from being accepted.

Bug: 62187985
Test: manual
Change-Id: Ic58ddd6d54e96f522445e67b90760dcfed13c27d

7 years agoMerge "Merge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c37430...
Android Build Merger (Role) [Tue, 22 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Merge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c374307 am: 9424fad097 am: 10663e4f76" into oc-mr1-dev-plus-aosp

7 years agoMerge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c374307 am...
Dan Albert [Tue, 22 Aug 2017 19:27:42 +0000 (19:27 +0000)]
Merge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c374307 am: 9424fad097
am: 10663e4f76

Change-Id: Ib9675e2e271bec1f2f0dfae65c915620682a9722

7 years agoMerge "Add trace counter for target screen brightness." into oc-mr1-dev
Michael Wright [Tue, 22 Aug 2017 19:26:10 +0000 (19:26 +0000)]
Merge "Add trace counter for target screen brightness." into oc-mr1-dev
am: 0ee6ea9e81

Change-Id: I7d8fb5ff124bbbe80fc5fe83b0c8c3920d9c6a77

7 years agoAllow clearing instant app meta-data
Svet Ganov [Tue, 22 Aug 2017 19:15:58 +0000 (12:15 -0700)]
Allow clearing instant app meta-data

The package manager has an API to clear the data of an app
which does not work for uninstalled instant apps for which
we store some meta-data (icon, title, cookie). This change
allows clearing the data of an uninstalled instant app.

Test: Instant cookie CTS tests use this API

bug:64517837

Change-Id: Ia929fead71b5ae786e88ddd0fa8e8a490d970dd0

7 years agoVolume dialog touch-tracking is disabled when in zenMute.
Beverly [Tue, 22 Aug 2017 18:47:28 +0000 (14:47 -0400)]
Volume dialog touch-tracking is disabled when in zenMute.

When simultaneously touch-sliding the volume dialog and using phone's
volume buttons, volume dialog could get into a weird state
where the volume dialog still thinks their is touch input after
entering/exiting zenMute.  This resulted in volume changes when using
the phone volume buttons but no change in the volume dialog UI. To
prevent this, the dialog will ensure there is no touch tracking
when it's in zenMute mode.

Bug: 30746594
Test: manual
Change-Id: I8f16d017d8e37ec7ff2f16df8f4997f64484412e

7 years agoMerge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 19:12:17 +0000 (19:12 +0000)]
Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev

7 years agoMerge "Add trace counter for target screen brightness." into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 19:11:09 +0000 (19:11 +0000)]
Merge "Add trace counter for target screen brightness." into oc-mr1-dev

7 years agoMerge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c374307
Dan Albert [Tue, 22 Aug 2017 19:09:10 +0000 (19:09 +0000)]
Merge "Remove TTS symbols from NDK stub library." am: b056324630 am: 8d8c374307
am: 9424fad097

Change-Id: I7cf73b94f601dbaf885cd701da58c1e127a558af

7 years agoMerge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444
Hall Liu [Tue, 22 Aug 2017 19:07:06 +0000 (19:07 +0000)]
Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444
am: 23566e82dd

Change-Id: I5308524da670b829ef8da474bfaee5d60caa6d86

7 years agoMerge "Remove TTS symbols from NDK stub library." am: b056324630
Dan Albert [Tue, 22 Aug 2017 18:57:46 +0000 (18:57 +0000)]
Merge "Remove TTS symbols from NDK stub library." am: b056324630
am: 8d8c374307

Change-Id: Ic138e5d087583e049b176b8c623eb77ff86ac182

7 years agoMerge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0
Hall Liu [Tue, 22 Aug 2017 18:53:34 +0000 (18:53 +0000)]
Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0
am: 0d73e03444

Change-Id: I5c5a8b6247ef844f86880cf4b162527d699e2fc9

7 years agoMerge "Fix lint errors in the streaming API" am: fa7e99ddf1
Hall Liu [Tue, 22 Aug 2017 18:44:53 +0000 (18:44 +0000)]
Merge "Fix lint errors in the streaming API" am: fa7e99ddf1
am: ac9893bba0

Change-Id: I0ae2ee130deb1d84cc9e343e9764f65ba46d3fd1

7 years agoMerge "Remove TTS symbols from NDK stub library."
Dan Albert [Tue, 22 Aug 2017 18:42:56 +0000 (18:42 +0000)]
Merge "Remove TTS symbols from NDK stub library."
am: b056324630

Change-Id: Ib1832f0b7e638b39f1ef88f92791c707c7ad80b2

7 years agoMerge "Fix lint errors in the streaming API"
Hall Liu [Tue, 22 Aug 2017 18:34:29 +0000 (18:34 +0000)]
Merge "Fix lint errors in the streaming API"
am: fa7e99ddf1

Change-Id: I57295aa7e212eb54014bee7580320cfd5e8d7bea

7 years agoMerge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev
Jorim Jaggi [Tue, 22 Aug 2017 18:23:50 +0000 (18:23 +0000)]
Merge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev
am: f8cb5482c8

Change-Id: Ie10ee4dd8a064da7efed43409e5f822a96539fcc

7 years agoMake dun APNs as read-only by default.
Amit Mahajan [Wed, 17 May 2017 22:36:30 +0000 (15:36 -0700)]
Make dun APNs as read-only by default.

Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30

7 years agoMerge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev
Jorim Jaggi [Tue, 22 Aug 2017 18:05:02 +0000 (18:05 +0000)]
Merge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev

7 years agoMerge "Remove TTS symbols from NDK stub library."
Treehugger Robot [Tue, 22 Aug 2017 18:03:10 +0000 (18:03 +0000)]
Merge "Remove TTS symbols from NDK stub library."

7 years agoMerge "Fix lint errors in the streaming API"
Hall Liu [Tue, 22 Aug 2017 17:55:06 +0000 (17:55 +0000)]
Merge "Fix lint errors in the streaming API"