OSDN Git Service
qingxi [Fri, 16 Jun 2017 02:43:46 +0000 (02:43 +0000)]
Merge "Add API from EuiccManager to wipe eUICC data" into oc-dr1-dev
am:
647b11c97f
Change-Id: Ic715e8c62ee01d975c591fa98d90f4b5bca0235d
TreeHugger Robot [Fri, 16 Jun 2017 02:33:09 +0000 (02:33 +0000)]
Merge "Add API from EuiccManager to wipe eUICC data" into oc-dr1-dev
Shunta Sato [Fri, 16 Jun 2017 02:07:54 +0000 (02:07 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev am:
892cd3e1e6
am:
769067fb99
Change-Id: I50b16c412bde9e8185336201a85fc487a56f11bf
Shunta Sato [Fri, 16 Jun 2017 02:02:06 +0000 (02:02 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev am:
892cd3e1e6
am:
da1c11400b
Change-Id: Ic2edc84d54098776e0de672a7eb0d2cee95d5be1
Shunta Sato [Fri, 16 Jun 2017 01:56:11 +0000 (01:56 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev
am:
892cd3e1e6
Change-Id: I1805b23929a56b5d54c660db7fdc5383233b3fe4
Shunta Sato [Fri, 16 Jun 2017 01:56:05 +0000 (01:56 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev
am:
892cd3e1e6
Change-Id: Ie1011f5c27008e50cdf9430669ef1d3ceb1f38e9
TreeHugger Robot [Fri, 16 Jun 2017 01:47:07 +0000 (01:47 +0000)]
Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 01:24:54 +0000 (01:24 +0000)]
Merge "Merge "Don't even think about changing keyguard transit" into oc-dev am:
3e3bb5f762 am:
69a4e37d19" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 16 Jun 2017 01:23:04 +0000 (01:23 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev am:
3e3bb5f762
am:
69a4e37d19
Change-Id: I4d6d43456ec8dddb24bb4cbcf307e995362cfab5
Jorim Jaggi [Fri, 16 Jun 2017 01:22:35 +0000 (01:22 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev am:
3e3bb5f762
am:
12e9967885
Change-Id: Id8d5f6523d51fd5ffcd019ab9a3f898f55ea2180
Jorim Jaggi [Fri, 16 Jun 2017 01:13:34 +0000 (01:13 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev
am:
3e3bb5f762
Change-Id: Ib73ffbe26038c8c29ee520ea461499875e4d23f5
Jorim Jaggi [Fri, 16 Jun 2017 01:13:34 +0000 (01:13 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev
am:
3e3bb5f762
Change-Id: I5ad8b077de7bbe692ac22e07fd2fb7ccb9264500
Android Build Merger (Role) [Fri, 16 Jun 2017 01:13:04 +0000 (01:13 +0000)]
Merge "Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev am:
2b20d552bd am:
3d268c9b7b" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Fri, 16 Jun 2017 01:08:08 +0000 (01:08 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev am:
2b20d552bd
am:
216bd4fa6f
Change-Id: I52b8db57081d12f1b13f5a6568cd6f3e660dc39b
Dianne Hackborn [Fri, 16 Jun 2017 01:06:51 +0000 (01:06 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev am:
2b20d552bd
am:
3d268c9b7b
Change-Id: I4b5d9089069025adca144ee63b0edee393930487
TreeHugger Robot [Fri, 16 Jun 2017 01:04:09 +0000 (01:04 +0000)]
Merge "Don't even think about changing keyguard transit" into oc-dev
Dianne Hackborn [Fri, 16 Jun 2017 00:54:21 +0000 (00:54 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev
am:
2b20d552bd
Change-Id: Id76ca5b865603af8188c4f85ed77626bd21711c3
Dianne Hackborn [Fri, 16 Jun 2017 00:54:18 +0000 (00:54 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev
am:
2b20d552bd
Change-Id: I86b140c89a01ec7d8032f9b136b494af64e9bdab
TreeHugger Robot [Fri, 16 Jun 2017 00:46:45 +0000 (00:46 +0000)]
Merge "Fix issue #
62524613: Background limitation is not working as expected..." into oc-dev
qingxi [Fri, 19 May 2017 22:20:03 +0000 (15:20 -0700)]
Add API from EuiccManager to wipe eUICC data
Use EuiccManager#eraseSubscriptions(PendingIntent) to erase all the
carrier data from eUICC chip if the user choose to "Erase eSIMs" from
the system setting.
Bug:
37475183
Test: E2E
Change-Id: Iaab2640c98576fdc87ca626765329ae0398724e4
Android Build Merger (Role) [Fri, 16 Jun 2017 00:13:29 +0000 (00:13 +0000)]
Merge "Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev am:
08b3fd966c am:
ba06f3fd18" into oc-dr1-dev-plus-aosp
Jeff Hao [Fri, 16 Jun 2017 00:11:13 +0000 (00:11 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev am:
08b3fd966c
am:
ba06f3fd18
Change-Id: Id882467304f09f2205f02286311cff04ae431a09
Jeff Hao [Fri, 16 Jun 2017 00:10:30 +0000 (00:10 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev am:
08b3fd966c
am:
76aa10ba24
Change-Id: I51e4246fc7d1c88bc3d05eb75dc29fa664f7bca7
Jeff Hao [Fri, 16 Jun 2017 00:01:30 +0000 (00:01 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev
am:
08b3fd966c
Change-Id: Iabcb03567e71585898f60160a3e0a5c8e6870f3b
Jeff Hao [Fri, 16 Jun 2017 00:01:30 +0000 (00:01 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." am:
8a945baf4a am:
47b1f54316
am:
2783f272b6
Change-Id: Id7236590276201928ba8abab549f3175d616a7bc
Jeff Hao [Fri, 16 Jun 2017 00:01:28 +0000 (00:01 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev
am:
08b3fd966c
Change-Id: Iefd9ddb5703a632438a4ef98bc9ba59e04c35206
Jeff Hao [Thu, 15 Jun 2017 23:53:47 +0000 (23:53 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." am:
8a945baf4a
am:
47b1f54316
Change-Id: Ie04409229e2f118f1785db46e2c6f3fb0aa7603e
TreeHugger Robot [Thu, 15 Jun 2017 23:52:01 +0000 (23:52 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev
Jeff Hao [Thu, 15 Jun 2017 23:43:32 +0000 (23:43 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only."
am:
8a945baf4a
Change-Id: I7c2733ac9dfe60ed8a629d5d312b760c53baa76e
Treehugger Robot [Thu, 15 Jun 2017 23:32:57 +0000 (23:32 +0000)]
Merge "When updating a split app, copy compiled files from base.apk only."
Android Build Merger (Role) [Thu, 15 Jun 2017 22:30:18 +0000 (22:30 +0000)]
Merge "Merge "don't block uninstall of unknown packages" into oc-dev am:
627fbf8157 am:
e9bec62854" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 15 Jun 2017 22:26:58 +0000 (22:26 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev am:
627fbf8157
am:
e9bec62854
Change-Id: Ice5b2d21986bfbb1735743843c6fbb178bb59ee2
Todd Kennedy [Thu, 15 Jun 2017 22:26:54 +0000 (22:26 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev am:
627fbf8157
am:
7076de2d52
Change-Id: Id4f708616b1e9c7ad780a2a4532191872ffd44a0
Todd Kennedy [Thu, 15 Jun 2017 22:20:17 +0000 (22:20 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev
am:
627fbf8157
Change-Id: I5cf548758617ae5c74f81a68b23893f584a46ee5
Todd Kennedy [Thu, 15 Jun 2017 22:17:57 +0000 (22:17 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev
am:
627fbf8157
Change-Id: I55a0b4906870f08de6b72ef601c151859fc0ccfb
Android Build Merger (Role) [Thu, 15 Jun 2017 22:06:29 +0000 (22:06 +0000)]
Merge "Merge "Update TV to show custom actions." into oc-dev am:
1a01d1298f am:
967811616e" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Thu, 15 Jun 2017 22:05:43 +0000 (22:05 +0000)]
Merge "don't block uninstall of unknown packages" into oc-dev
Winson Chung [Thu, 15 Jun 2017 22:05:27 +0000 (22:05 +0000)]
Merge "Update TV to show custom actions." into oc-dev am:
1a01d1298f
am:
967811616e
Change-Id: I7b89231b51a6a9b40a5c74ff4cdbc4f1eaa5c037
Winson Chung [Thu, 15 Jun 2017 22:04:22 +0000 (22:04 +0000)]
Merge "Update TV to show custom actions." into oc-dev am:
1a01d1298f
am:
f7bb25e8ae
Change-Id: I858e5e115888a5c2ce39954ba50a3f7eef2f6014
Eugene Susla [Thu, 15 Jun 2017 22:00:21 +0000 (22:00 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev am:
7a4cf16ce9
am:
7e5fd51c9b
Change-Id: I909e4238fe74940a6a1e3a4e9a1a8f7f3dc45dd6
Eugene Susla [Thu, 15 Jun 2017 21:55:52 +0000 (21:55 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev am:
7a4cf16ce9
am:
812d6d9b80
Change-Id: I7f736af6fefcd9f4f337c4a5a899719deb6a1290
Winson Chung [Thu, 15 Jun 2017 21:51:52 +0000 (21:51 +0000)]
Merge "Update TV to show custom actions." into oc-dev
am:
1a01d1298f
Change-Id: I841d27de83656a1f8b3bf279401217348569fea7
Eugene Susla [Thu, 15 Jun 2017 21:48:47 +0000 (21:48 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
am:
7a4cf16ce9
Change-Id: Iad09afd86c9e6b3692654083743d5014b978cac8
Winson Chung [Thu, 15 Jun 2017 21:48:08 +0000 (21:48 +0000)]
Merge "Update TV to show custom actions." into oc-dev
am:
1a01d1298f
Change-Id: I1d23e5ba9e061a50bea052b2eb6cb7114e99ff63
Eugene Susla [Thu, 15 Jun 2017 21:44:37 +0000 (21:44 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
am:
7a4cf16ce9
Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1
Eino-Ville Talvala [Thu, 15 Jun 2017 21:39:00 +0000 (21:39 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f
am:
730a1168e6
Change-Id: Ibdb549782294671faf606a5ee44e0b03e4d8a8d4
Dianne Hackborn [Thu, 15 Jun 2017 21:33:16 +0000 (14:33 -0700)]
Fix issue #
62524613: Background limitation is not working as expected...
...for most background services.
Whoops, was only stopping the first service it found!
Test: bit CtsAppTestCases:ActivityManagerProcessStateTest
Change-Id: I42af2872afed8b49fab0f53eff36b62e55d23409
Eino-Ville Talvala [Thu, 15 Jun 2017 21:29:16 +0000 (21:29 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am:
20c2116c1f
am:
20e2394f75
Change-Id: If7a88771020bd2cb8a5a38496488dfbd789debf7
Eino-Ville Talvala [Thu, 15 Jun 2017 21:12:29 +0000 (21:12 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am:
20c2116c1f
Change-Id: I8385f1e65de888d602e5775f6811ec7c908f9073
Eino-Ville Talvala [Thu, 15 Jun 2017 21:10:51 +0000 (21:10 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am:
20c2116c1f
Change-Id: I82b234f1fa7ea6b231bacdd99543b68fa8be51c6
Winson Chung [Thu, 15 Jun 2017 21:05:44 +0000 (21:05 +0000)]
Merge "Update TV to show custom actions." into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 20:57:16 +0000 (20:57 +0000)]
Merge "Fix companion uses-permission enforcement" into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 20:56:38 +0000 (20:56 +0000)]
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
Ying Xu [Thu, 15 Jun 2017 19:58:40 +0000 (19:58 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master am:
fa67fe7a4e
am:
d7e9bbedc8
Change-Id: I9a3d4e90de84c9745369f20905215bb6d761cebb
Ying Xu [Thu, 15 Jun 2017 19:56:18 +0000 (19:56 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2 am:
c4f797652c
am:
ce80092aaf
Change-Id: Iec9e028d5c05d427cc3b1f81e97defb873b13d64
Jorim Jaggi [Thu, 15 Jun 2017 19:10:38 +0000 (15:10 -0400)]
Don't even think about changing keyguard transit
When camera was launched with a lockscreen wallpaper set, the
wallpaper target was launcher in that case, which was also in
mClosingApps because it was first getting shown by keyguard
exit but then immediately hidden by starting the camera,
before the transition started.
Now since lockscreen wasn't the wallpaper target, launcher was
already for some reason, and we changed the transit to
WALLPAPER_CLOSE as a window with the wallpaper target was in
mClosingApps.
Fix this by never ever changing away from keyguard transits.
Test: go/wm-smoke
Test: ActivityManagerTransitionSelectionTests
Test: Set lockscreen wallpaper, set animation duration scale to
0.5, insert a random sleep statement in SystemUI, launch
camera from screen off while in trusted state and camera
wasn't running before.
Fixes:
37677242
Change-Id: I984b66d7f117034f3d55591284dd822b5ec76cbd
Jason Monk [Thu, 15 Jun 2017 19:49:52 +0000 (19:49 +0000)]
Merge "resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
797fdc4450
Change-Id: I71bf3a951130edc7af2c7e0f24b2acb078d76a83
Ying Xu [Thu, 15 Jun 2017 19:48:07 +0000 (19:48 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master
am:
fa67fe7a4e
Change-Id: I62d094ce16e65bf613e5e4b9405c87726e175c8f
Android Build Merger (Role) [Thu, 15 Jun 2017 19:46:21 +0000 (19:46 +0000)]
Merge "Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0 am:
5618d79349" into oc-dr1-dev-plus-aosp
Sudheer Shanka [Thu, 15 Jun 2017 19:45:19 +0000 (19:45 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0
am:
5618d79349
Change-Id: I5d79993e0e855501aa13b1afcd7af068eeeb3d93
Ying Xu [Thu, 15 Jun 2017 19:44:45 +0000 (19:44 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2
am:
c4f797652c
Change-Id: If7d2093b6ff24bffeeb75a6eb0e91d047b872dad
Sudheer Shanka [Thu, 15 Jun 2017 19:43:37 +0000 (19:43 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev am:
2ca51820f0
am:
f9053435a3
Change-Id: I8ad8b8a273b70345ac024e27faa1484fb06afacd
TreeHugger Robot [Thu, 15 Jun 2017 19:42:47 +0000 (19:42 +0000)]
Merge "resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp
Sudheer Shanka [Thu, 15 Jun 2017 19:36:18 +0000 (19:36 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
am:
2ca51820f0
Change-Id: I077aab98854ec3d7df78b107518e0151be78a30c
Sudheer Shanka [Thu, 15 Jun 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
am:
2ca51820f0
Change-Id: I863f048dd4b95c0f9278fe8aefc432f852b82eae
Sudheer Shanka [Thu, 15 Jun 2017 19:25:02 +0000 (19:25 +0000)]
Merge "Use correct timestamps of events for logging." into oc-dev
Jeff Hao [Tue, 13 Jun 2017 18:09:10 +0000 (11:09 -0700)]
When updating a split app, copy compiled files from base.apk only.
This fixes issues with some splits failing to be recompiled if they
haven't changed, but the dex files they depend on have.
The real fix will be for frameworks to generate the new expected
classpath and check in DexFile.getDexOptNeeded. Then we can undo
this change and copy over all the compiled split files again.
Bug:
62269291
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
(cherry-picked from commit
d1235f54d4943a0a3a920013a5875b5193bd0490)
Change-Id: I6e640a966ef3b43054d163326878adebe2329693
Android Build Merger (Role) [Thu, 15 Jun 2017 19:04:11 +0000 (19:04 +0000)]
Merge "Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f am:
92cc8d3816" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Thu, 15 Jun 2017 19:01:41 +0000 (19:01 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f
am:
84795f778b
Change-Id: I90d6e150b6dcfe7665b5c1b7db84dd04a7d0d824
Dianne Hackborn [Thu, 15 Jun 2017 19:01:37 +0000 (19:01 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev am:
ef0554438f
am:
92cc8d3816
Change-Id: I1b83fc377f95dad7e5692f82601dddafdd9ab92c
Dianne Hackborn [Thu, 15 Jun 2017 18:52:18 +0000 (18:52 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
ef0554438f
Change-Id: I5d25640507d4c4cf61f64638d27ddf0cac67f880
Dianne Hackborn [Thu, 15 Jun 2017 18:52:07 +0000 (18:52 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
am:
ef0554438f
Change-Id: I39ad3ffce83c1817bdc8aa7ab9f623d1b683d983
Dianne Hackborn [Thu, 15 Jun 2017 18:45:28 +0000 (18:45 +0000)]
Merge "Work on issue #
36891897: Need to ensure foreground services..." into oc-dev
Eugene Susla [Thu, 15 Jun 2017 18:22:57 +0000 (11:22 -0700)]
Fix companion uses-permission enforcement
Fixes: b/
62662686
Test: Call CompanionDeviceManager#associate from app without uses-permission
declaration
Ensure exception is thrown
Call the method from app with the declaration
Ensure no exception is thrown
In debug mode catch the #isCallerSystem call from NotificationManagerService
(which runs in the system process) and ensure it passes the check
Change-Id: I26e5d2a7f5e63a346d4ab50b9ded1ec7dbc246a5
Stephen Chen [Thu, 15 Jun 2017 18:11:36 +0000 (18:11 +0000)]
Merge "Add notification ID for Wi-Fi ONA notifications." into oc-dr1-dev
am:
ae448fbf5f
Change-Id: I7fbc759fc689819790055e6ff7b4794dc4388e19
TreeHugger Robot [Thu, 15 Jun 2017 18:03:53 +0000 (18:03 +0000)]
Merge "Add notification ID for Wi-Fi ONA notifications." into oc-dr1-dev
Jason Monk [Thu, 15 Jun 2017 17:41:14 +0000 (13:41 -0400)]
resolve merge conflicts of
8c1e6e49f95b to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If41b96601018976c8f5a5ea8d124bc0abb4ef605
Android Build Merger (Role) [Thu, 15 Jun 2017 17:07:11 +0000 (17:07 +0000)]
Merge "Merge "Use java.util.Objects.hashCode to get hashcode." am:
3890689bb2" into stage-aosp-master
Ying Xu [Thu, 15 Jun 2017 17:06:03 +0000 (17:06 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
am:
3890689bb2
Change-Id: I6b295dfe38e8c75ab6dd3add2521d63b62f4c8f1
Ying Xu [Thu, 15 Jun 2017 16:59:59 +0000 (16:59 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
am:
3890689bb2
Change-Id: I07e33a09f7ed2af457d2ad6261b5469b9dfd15c2
Ying Xu [Thu, 15 Jun 2017 16:50:09 +0000 (16:50 +0000)]
Merge "Use java.util.Objects.hashCode to get hashcode."
Android Build Merger (Role) [Thu, 15 Jun 2017 16:40:10 +0000 (16:40 +0000)]
Merge "Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe am:
4bf303695b" into oc-dr1-dev-plus-aosp
Chris Wren [Thu, 15 Jun 2017 16:37:26 +0000 (16:37 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe
am:
c31da7a282
Change-Id: I0dba70d94710852d07fa3f141d61ed869756a379
Chris Wren [Thu, 15 Jun 2017 16:37:26 +0000 (16:37 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev am:
04298759fe
am:
4bf303695b
Change-Id: I8549aa837ade3636532deeacb197037e6da131a8
Chris Wren [Thu, 15 Jun 2017 16:28:32 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: I4813fcd717b966e2ed2b1835d12d4183633f60ff
Chris Wren [Thu, 15 Jun 2017 16:28:27 +0000 (16:28 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
am:
04298759fe
Change-Id: Ic53f15be9f13034e72fa056308e75fa0f4f310b0
Evan Laird [Thu, 15 Jun 2017 16:22:01 +0000 (16:22 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev
am:
e836b7d8e5
Change-Id: I39dd789b5daea9abfafac22860e68d43d2a07746
TreeHugger Robot [Thu, 15 Jun 2017 16:20:07 +0000 (16:20 +0000)]
Merge "add a log for peek to shade expansion" into oc-dev
TreeHugger Robot [Thu, 15 Jun 2017 16:14:46 +0000 (16:14 +0000)]
Merge "Status bar opacity and mobile signal changes" into oc-dr1-dev
Jason Monk [Thu, 15 Jun 2017 15:32:26 +0000 (15:32 +0000)]
Merge "NfcTile: make sure NFC adapter is always available when needed"
am:
13ade8f910
Change-Id: I731c4d0f3460d1b2a24232a87afcd5c327ecb4b0
Jason Monk [Thu, 15 Jun 2017 15:21:36 +0000 (15:21 +0000)]
Merge "NfcTile: make sure NFC adapter is always available when needed"
Anas Karbila [Thu, 15 Jun 2017 13:36:53 +0000 (22:36 +0900)]
NfcTile: make sure NFC adapter is always available when needed
Test: enable NFC->reboot->directly open QS panel, NFC tile will show disabled state. This commit fixes it.
Change-Id: Iabbe4ec11a38614b9c65627d58c6ee9ec93435f3
Todd Kennedy [Thu, 15 Jun 2017 13:38:09 +0000 (06:38 -0700)]
don't block uninstall of unknown packages
If a package can't be found because it's not installed or it's
been filtered due to lack of visibility, don't claim the uninstall
should be blocked.
Change-Id: I932b77cea5749e5964ca626558bef51cdfdfd17b
Fixes:
62450984
Test: Manual
Eino-Ville Talvala [Tue, 13 Jun 2017 19:43:19 +0000 (12:43 -0700)]
ImageReader: Set BufferItem mGraphicBuffer to null when returning it
The ImageReader JNI layer needs to maintain a list of BufferItems that
back the Java Image objects. At start, we allocate maxImages of these
in a list, and acquire and release them from this list as the
application acquires and releases Images.
However, on release, the contents of the BufferItem are not adjusted,
so it can retain a reference to a GraphicBuffer until the BufferItem
is reused.
Test: Camera CTS passes, memory usage drops after camera bursts
Bug:
62652080
Change-Id: I9aade5e32cbe0af0c15a3886e16ada1a70392b74
Chris Wren [Wed, 14 Jun 2017 19:59:03 +0000 (15:59 -0400)]
add a log for peek to shade expansion
Move the note_load counter into the manager, replacing
the redundant and useless notification_load counter.
Update the StatusBarTest to allow for hander side-effects.
Test: runtest systemui
Change-Id: I2551c51cc0f4627995abe4401eafc2e5adb3a8fa
Fixes:
27698560
Paul Duffin [Thu, 15 Jun 2017 11:04:30 +0000 (11:04 +0000)]
Fix dependencies of packages that target earlier releases
am:
37e9a28262
Change-Id: Ib8b9272423ba7513ea653843335fd1907970c40f
Erik Kline [Thu, 15 Jun 2017 10:49:12 +0000 (10:49 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
am:
ed1519d095 -s ours
Change-Id: I61101f481d6508786664d49a7f7a560a29464a8e
TreeHugger Robot [Thu, 15 Jun 2017 10:43:18 +0000 (10:43 +0000)]
Merge "Move findPreferredUpstreamType into UNM" into oc-dr1-dev
Paul Duffin [Tue, 13 Jun 2017 14:53:11 +0000 (15:53 +0100)]
Fix dependencies of packages that target earlier releases
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.
This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* packages/SettingsProvider/test/Android.mk
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SettingsProviderTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module
SettingsProviderTest uses classes from package android.test
(possible indirectly) and needs them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
* services/tests/servicestests/Android.mk
Replaced 'android.test.runner' with 'android.test.mock' and
'legacy-android-test' in LOCAL_JAVA_LIBRARIES because module
FrameworksServicesTests uses classes from packages android.test and
android.test.mock (possible indirectly) and needs them available at
compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
They were not added to LOCAL_STATIC_JAVA_LIBRARIES because
FrameworksServicesTests's manifest file (AndroidManifest.xml)
targets API level 26 and uses the android.test.runner library which
will provide the classes dynamically at runtime.
Dependency 'android.test.mock.sdk' is used instead of
'android.test.mock' because module FrameworksServicesTests builds
against internal jars not the API and so should use libraries that
build against internal jars not the API.
* tests/AppLaunch/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppLaunch uses classes from
package android.test (possible indirectly) and needs them available
at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppLaunch's manifest file (AndroidManifest.xml) targets API
level 24 and dynamically includes the android.test.runner library
at runtime so there is no point in statically including the
classes.
* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module SmartCamera-tests uses classes
from package android.test (possible indirectly) and needs them
available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because SmartCamera-tests's manifest file (AndroidManifest.xml)
targets API level 17 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
* tests/Compatibility/Android.mk
Replaced 'android.test.runner' with 'legacy-android-test' in
LOCAL_JAVA_LIBRARIES because module AppCompatibilityTest uses
classes from package android.test (possible indirectly) and needs
them available at compile time.
Dependency 'legacy-android-test' is used instead of
'android.test.runner' because the latter will conflict with
dependencies on junit.
Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
because AppCompatibilityTest's manifest file (AndroidManifest.xml)
targets API level 21 and dynamically includes the
android.test.runner library at runtime so there is no point in
statically including the classes.
Bug:
30188076
Test: make checkbuild and ran a sample of tests
Change-Id: I3d183a96bf87437028a2d4b774d311e40349f4d0
Android Build Merger (Role) [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am:
0823c9ff5c am:
641160b7d4" into oc-dr1-dev-plus-aosp