OSDN Git Service
Felipe Leme [Tue, 6 Jun 2017 23:53:16 +0000 (23:53 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev am:
301fc823f3
am:
9a1b6b0eb2
Change-Id: Ifbda0a75a79e644763e83baf86a7823310a56f5b
Android Build Merger (Role) [Tue, 6 Jun 2017 23:49:09 +0000 (23:49 +0000)]
Merge "Merge "Handle renamed packages during default grants" into oc-dev am:
bfc083c3a0 am:
7e05bb7793"
Todd Kennedy [Tue, 6 Jun 2017 23:48:19 +0000 (23:48 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev am:
bfc083c3a0
am:
7e05bb7793
Change-Id: Ib4e3b2799c2a104fd203b6e64e86d6181567b177
Christine Franks [Tue, 6 Jun 2017 23:47:37 +0000 (23:47 +0000)]
Merge "Add TRON counter for demo user creation"
Felipe Leme [Tue, 6 Jun 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am:
301fc823f3
Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891
Isai Damier [Tue, 6 Jun 2017 23:43:44 +0000 (23:43 +0000)]
Merge "Redundant/duplicate method to close Streams Fixes:
62304559 Test: the code compiles which mean polymorphism works. No additional tests necessary Change-Id: I3d366f12c1f176213979da6b050957bc2adb2938"
Todd Kennedy [Tue, 6 Jun 2017 23:41:06 +0000 (23:41 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
am:
bfc083c3a0
Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b
Felipe Leme [Tue, 6 Jun 2017 23:30:57 +0000 (23:30 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
Todd Kennedy [Tue, 6 Jun 2017 23:29:05 +0000 (23:29 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev
Daniel Sheng [Tue, 6 Jun 2017 23:26:05 +0000 (23:26 +0000)]
Merge "Changed camera lift trigger to default-on."
Selim Cinek [Tue, 6 Jun 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev am:
25e509462f
am:
b8c7c9ee2d
Change-Id: I8560e900e1c0c2cf7caf1ba748a5b928ff69f638
TreeHugger Robot [Tue, 6 Jun 2017 23:03:56 +0000 (23:03 +0000)]
Merge "Add logging to track search no-result case"
Selim Cinek [Tue, 6 Jun 2017 23:02:41 +0000 (23:02 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
am:
25e509462f
Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98
Daniel Sandler [Tue, 6 Jun 2017 23:00:53 +0000 (23:00 +0000)]
Merge "resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
9dd289529d
Change-Id: Ic2151c9a6a4f8ff1d76effa5b935ffa3e43bb0d8
TreeHugger Robot [Tue, 6 Jun 2017 22:54:36 +0000 (22:54 +0000)]
Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
Daniel Sandler [Tue, 6 Jun 2017 22:53:00 +0000 (22:53 +0000)]
Merge "resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Keyvan Amiri [Tue, 6 Jun 2017 22:13:48 +0000 (22:13 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev am:
08b953dd2e
am:
6cae189d26
Change-Id: I4c71d58c3f9d640abaa941324c570c6168002cad
sunjian [Tue, 6 Jun 2017 22:11:19 +0000 (22:11 +0000)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type. am:
d62dc39dc5
am:
b22429d53f
Change-Id: I40675817d0102c51a4ad4988bc4c1445842883b3
Keyvan Amiri [Tue, 6 Jun 2017 22:05:13 +0000 (22:05 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
am:
08b953dd2e
Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965
TreeHugger Robot [Tue, 6 Jun 2017 21:56:16 +0000 (21:56 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev
sunjian [Tue, 6 Jun 2017 21:56:07 +0000 (21:56 +0000)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type.
am:
d62dc39dc5
Change-Id: Idf3475786676e9713e4fa5756ecce9c675da8c3e
Julius D'souza [Tue, 6 Jun 2017 21:48:26 +0000 (21:48 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev am:
9fd3076fe6
am:
cc162a1e4f
Change-Id: If743c9ed506aa6e1035303d50c48de7093a8c7e7
sunjian [Thu, 1 Jun 2017 19:05:59 +0000 (12:05 -0700)]
Update AccountManagerService side logic for .getAccountsByTypeForPackage
with null type.
Bug:
37987384
Test: manual, APCT
Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19
Aurimas Liutikas [Tue, 6 Jun 2017 21:45:45 +0000 (21:45 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev am:
c742b8ab2d
am:
964993e9aa
Change-Id: I6f6e5c06b274d55f47483fd4d7bf20d50c08741b
TreeHugger Robot [Tue, 6 Jun 2017 21:39:54 +0000 (21:39 +0000)]
Merge "AAPT2: Do not interpret %n as a format specifier in string resources"
Julius D'souza [Tue, 6 Jun 2017 21:36:50 +0000 (21:36 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
am:
9fd3076fe6
Change-Id: If95a7b60b75f06eb3c67de24b837c26ce259db92
TreeHugger Robot [Tue, 6 Jun 2017 21:35:44 +0000 (21:35 +0000)]
Merge "Add new haptic feedback constant for virtual key release."
Julius D'souza [Tue, 6 Jun 2017 21:29:39 +0000 (21:29 +0000)]
Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
Aurimas Liutikas [Tue, 6 Jun 2017 21:29:29 +0000 (21:29 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev
am:
c742b8ab2d
Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f
TreeHugger Robot [Tue, 6 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "Remove usages of ActionBarActivity." into oc-dev
Todd Kennedy [Tue, 6 Jun 2017 20:44:09 +0000 (13:44 -0700)]
Handle renamed packages during default grants
If a device has a privileged app on the system image which was
updated and a future OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.
Test: Manual
Change-Id: Id7255c92a4a52e368266739cd331977256eee2d3
Fixes:
62376260
Christopher Tate [Tue, 6 Jun 2017 20:43:28 +0000 (20:43 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev am:
42abe82bbb
am:
169a884f81
Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773
Jorim Jaggi [Tue, 6 Jun 2017 20:41:13 +0000 (20:41 +0000)]
Fix issue with dialer launch transition am:
db93133782
am:
1a5f0c7ca8
Change-Id: Id8384736c70d82b9ef95e4cb805dde08f039dc04
Jason Monk [Tue, 6 Jun 2017 20:38:00 +0000 (16:38 -0400)]
resolve merge conflicts of
be23ef368f1a to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5364727a21f62fc479c9bca6ad7ab2c3b62d1d1b
Daniel Nishi [Tue, 6 Jun 2017 20:37:31 +0000 (20:37 +0000)]
Merge "Change storage manager default to be a config."
TreeHugger Robot [Tue, 6 Jun 2017 20:37:01 +0000 (20:37 +0000)]
Merge "Implement CacheManager for the Skia pipelines."
Christopher Tate [Tue, 6 Jun 2017 20:32:55 +0000 (20:32 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev
am:
42abe82bbb
Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
Jorim Jaggi [Tue, 6 Jun 2017 20:30:08 +0000 (20:30 +0000)]
Fix issue with dialer launch transition
am:
db93133782
Change-Id: Id1808ca8d1f2547ecb85679c4b7697ee37f69d9f
TreeHugger Robot [Tue, 6 Jun 2017 20:25:47 +0000 (20:25 +0000)]
Merge "Initial support for proposed android.net.lowpan"
Etan Cohen [Tue, 6 Jun 2017 20:20:27 +0000 (20:20 +0000)]
Merge "[P2P] Add binder to service calls"
TreeHugger Robot [Tue, 6 Jun 2017 20:18:16 +0000 (20:18 +0000)]
Merge "Fix #
62350081 - annotate permission requirements" into oc-dev
Jorim Jaggi [Thu, 1 Jun 2017 23:07:34 +0000 (16:07 -0700)]
Fix issue with dialer launch transition
Test: Disable assistant, launch dialer on secure keyguard
Test: Launch assistant
Test: Launch camera
Change-Id: Ic3231f5f28fa0cf704b5f5d6e1993b296f14f5a3
Fixes:
38450585
Bryce Lee [Tue, 6 Jun 2017 20:05:05 +0000 (20:05 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev am:
1795242288
am:
2112d52636
Change-Id: I63bef7c4871117bd22bf552da696a20b889d27cb
Adam Lesinski [Fri, 2 Jun 2017 23:32:37 +0000 (16:32 -0700)]
AAPT2: Do not interpret %n as a format specifier in string resources
%n is a special value marking a platform independent newline and is
not to be considered a format argument.
Bug:
37132275
Test: make aapt2_tests
Change-Id: I806521e44afe20004344dee9f18ecee6cc7086ea
Bryce Lee [Tue, 6 Jun 2017 19:52:35 +0000 (19:52 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev
am:
1795242288
Change-Id: I41ae908e86152f42590fc346db382419c5b0a27b
TreeHugger Robot [Tue, 6 Jun 2017 19:49:47 +0000 (19:49 +0000)]
Merge "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml"
Bryce Lee [Tue, 6 Jun 2017 19:42:40 +0000 (19:42 +0000)]
Merge "Associate freezing display with a target display id." into oc-dev
Fan Zhang [Tue, 6 Jun 2017 19:37:13 +0000 (12:37 -0700)]
Add logging to track search no-result case
Bug:
37211659
Test: builds
Change-Id: I93de5891ce7d4757f1fc5b7a3c70292676fcd8ec
Keyvan Amiri [Tue, 6 Jun 2017 05:48:26 +0000 (22:48 -0700)]
Disabled task snapshot for TV
This was causing memory leaks when opening/closing Apps view. Will
disable this feature on TV since we are running low on RAM.
Bug:
62040693
Bug:
62359697
Test: go/wm-smoke
Change-Id: Ida290e8babc83a998a55efd10d602eb7f05f3102
Matthew Ng [Tue, 6 Jun 2017 19:34:36 +0000 (19:34 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev am:
229119e06b
am:
9fb7f5f1dc
Change-Id: I5880e105b76bb567a6a1ab90301736a16e1c34c8
Matthew Ng [Tue, 6 Jun 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev
am:
229119e06b
Change-Id: I4516daadd7ec9ceba523b3b6e1d58f6843c7600d
TreeHugger Robot [Tue, 6 Jun 2017 19:09:12 +0000 (19:09 +0000)]
Merge "Add back recents staggering entrance animation" into oc-dev
Sundeep Ghuman [Tue, 6 Jun 2017 19:03:10 +0000 (19:03 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev am:
32c65fccaf
am:
1e61697d3c -s ours
Change-Id: I5b58c7052570ff8c6681bb19c8309e86a118425e
Gabriele M [Tue, 6 Jun 2017 19:00:21 +0000 (19:00 +0000)]
Merge "QS: Remove listeners only if added" am:
bede96729c
am:
a8e8f1c9f6
Change-Id: Id8211c9683230ee5cbf1bc7497f5e7d879116d56
Jian Sun [Tue, 6 Jun 2017 19:00:17 +0000 (19:00 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev am:
f1946baae7
am:
c3c3112806
Change-Id: I82589c5cf90d8dbb02bab757d58e8584bd05bdb8
Sundeep Ghuman [Tue, 6 Jun 2017 18:51:54 +0000 (18:51 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev
am:
32c65fccaf
Change-Id: I40586bcf4ab1fc32a15c145798460008ded764d1
Gabriele M [Tue, 6 Jun 2017 18:49:15 +0000 (18:49 +0000)]
Merge "QS: Remove listeners only if added"
am:
bede96729c
Change-Id: I53250273e39889b6b772dc12bbdbbc0c9606fd47
Jian Sun [Tue, 6 Jun 2017 18:48:33 +0000 (18:48 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
am:
f1946baae7
Change-Id: Iacba4bd641367f5cf64bcd4d7098bba05fca835d
TreeHugger Robot [Tue, 6 Jun 2017 18:45:11 +0000 (18:45 +0000)]
Merge "Don't show unset score values for AccessPoints." into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Add SLOW network and remove deprecated enums."
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/
33073713
Change-Id: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
Treehugger Robot [Tue, 6 Jun 2017 18:36:25 +0000 (18:36 +0000)]
Merge "QS: Remove listeners only if added"
Jian Sun [Tue, 6 Jun 2017 18:29:58 +0000 (18:29 +0000)]
Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev
isaid [Sat, 3 Jun 2017 00:07:01 +0000 (20:07 -0400)]
Redundant/duplicate method to close Streams
Fixes:
62304559
Test: the code compiles which mean polymorphism works. No additional
tests necessary
Change-Id: I3d366f12c1f176213979da6b050957bc2adb2938
Derek Sollenberger [Thu, 1 Jun 2017 17:07:39 +0000 (13:07 -0400)]
Implement CacheManager for the Skia pipelines.
The core of the implementation is complete and provides heuristic
cache sizing based on the size of the surface being used. This CL
will also be used to add the following features in the future...
1) Support Vulkan pipeline reporting on the size of the surface.
2) Complete the VectorDrawableAtlas stub code
3) Automatic purging of stale resources for low memory devices.
Test: hwui_unit_tests (new test added) and CtsUiRendering
Bug:
62260637
Change-Id: Ib85159cca28b646fe249f2190b07f1b7e0f50d8f
Adam Lesinski [Fri, 2 Jun 2017 19:55:24 +0000 (12:55 -0700)]
AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml
Bug:
62189611
Test: make AaptTestAppOne
Change-Id: Ic090e4a002b24f2289f47dfba7439638e5848062
Wale Ogunwale [Tue, 6 Jun 2017 18:08:49 +0000 (18:08 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev am:
d7427d5d90
am:
b4f383c26e
Change-Id: Ibded63bebba40bc29978dee2717dd61a36d609a9
Wale Ogunwale [Tue, 6 Jun 2017 17:53:46 +0000 (17:53 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev
am:
d7427d5d90
Change-Id: I6dfe65d2d3e2c69be14b472dcd3e28389e70655f
TreeHugger Robot [Tue, 6 Jun 2017 17:46:31 +0000 (17:46 +0000)]
Merge "Don't allow removed DividerView to resize stack" into oc-dev
Sundeep Ghuman [Mon, 5 Jun 2017 23:10:38 +0000 (16:10 -0700)]
Don't show unset score values for AccessPoints.
Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed
Bug: b/
3692675
Test: Visual confirmation
Change-Id: I52909bf55e6efabd2be6c17542f2a15135d25c62
Etan Cohen [Thu, 25 May 2017 18:06:40 +0000 (11:06 -0700)]
[P2P] Add binder to service calls
Bug:
33040182
Test: unit tests, run-time behavior
Change-Id: Ic383efc858bb4454d99c98ab24365c63ad3e7f54
TreeHugger Robot [Tue, 6 Jun 2017 17:17:05 +0000 (17:17 +0000)]
Merge "Add logging metrics for ConfigureKeyGuardDialog"
Chen Xu [Tue, 6 Jun 2017 17:14:05 +0000 (17:14 +0000)]
Merge "new strings to support vzw roaming feature"
Makoto Onuki [Tue, 6 Jun 2017 17:00:17 +0000 (17:00 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am:
a9c185f6e7
am:
a178d194f9
Change-Id: Iec712211a2c83798ae160560d1cca9ce23b7e577
Makoto Onuki [Tue, 6 Jun 2017 16:44:59 +0000 (16:44 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
am:
a9c185f6e7
Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a
Gabriele M [Mon, 5 Jun 2017 15:55:03 +0000 (17:55 +0200)]
QS: Remove listeners only if added
handleDestroy() calls setListening(false) unconditionally. This
causes an error if no listener was never added. Check if we added
a listener and then try to remove it.
Change-Id: Iefe8aacbe87ba1c2c19c9e77cf132fc7c84798f9
Makoto Onuki [Tue, 6 Jun 2017 16:26:05 +0000 (16:26 +0000)]
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
Jeff Sharkey [Tue, 6 Jun 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Give Doclava our manifest; more permission docs." into oc-dev am:
65d4cbba37
am:
67cb5f5210
Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
Android Build Merger (Role) [Tue, 6 Jun 2017 16:12:50 +0000 (16:12 +0000)]
Merge "Merge "WifiConfiguration: add local only networkId" into oc-dev am:
46f4d5c4a6 am:
0ffff6a341"
Rebecca Silberstein [Tue, 6 Jun 2017 16:11:46 +0000 (16:11 +0000)]
Merge "WifiConfiguration: add local only networkId" into oc-dev am:
46f4d5c4a6
am:
0ffff6a341
Change-Id: I84c310c491dff17f193e8e7942c2ba90798e65b9
Android Build Merger (Role) [Tue, 6 Jun 2017 16:11:16 +0000 (16:11 +0000)]
Merge "Merge "Coordinate configuration changes and window frame size." into oc-dev am:
749cbb1911 am:
42e95f8b54"
Bryce Lee [Tue, 6 Jun 2017 16:10:17 +0000 (16:10 +0000)]
Merge "Coordinate configuration changes and window frame size." into oc-dev am:
749cbb1911
am:
42e95f8b54
Change-Id: I6ecf592612f5c9d54c37ae9df9525b2f9e14826d
Android Build Merger (Role) [Tue, 6 Jun 2017 16:09:49 +0000 (16:09 +0000)]
Merge "Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4 am:
de30ee2d40 am:
e468747115 am:
2fa69bdfce -s ours"
Paul Duffin [Tue, 6 Jun 2017 16:08:43 +0000 (16:08 +0000)]
Merge "Added android.test.mock and android.test.mock.sdk targets" am:
46f8d427c4 am:
de30ee2d40 am:
e468747115
am:
2fa69bdfce -s ours
Change-Id: I2559922e3e55d0b64dea38646836fe3ab8ee7fd0
Android Build Merger (Role) [Tue, 6 Jun 2017 16:07:55 +0000 (16:07 +0000)]
Merge "Merge "Support setting upstream parameters." am:
faf8d67749 am:
4e5024131b am:
e2018a407a am:
6ce08f623c"
Erik Kline [Tue, 6 Jun 2017 16:06:43 +0000 (16:06 +0000)]
Merge "Support setting upstream parameters." am:
faf8d67749 am:
4e5024131b am:
e2018a407a
am:
6ce08f623c
Change-Id: Ia290ef28f466d6a5c3f7208b1bc078bd7a2c204a
Android Build Merger (Role) [Tue, 6 Jun 2017 16:06:12 +0000 (16:06 +0000)]
Merge "Merge "Revert "Disabled task snapshot for TV"" into oc-dev am:
faf86491e9 am:
8212cdfb40"
Guang Zhu [Tue, 6 Jun 2017 16:05:04 +0000 (16:05 +0000)]
Merge "Revert "Disabled task snapshot for TV"" into oc-dev am:
faf86491e9
am:
8212cdfb40
Change-Id: I421c7bd88c694f569b267e25bf7e7428a4e9d300
Android Build Merger (Role) [Tue, 6 Jun 2017 16:04:32 +0000 (16:04 +0000)]
Merge "Merge "Don't verify instant apps" into oc-dev am:
9bac79a540 am:
27eb2e2b5b"
Todd Kennedy [Tue, 6 Jun 2017 16:03:31 +0000 (16:03 +0000)]
Merge "Don't verify instant apps" into oc-dev am:
9bac79a540
am:
27eb2e2b5b
Change-Id: I65b0a71e71620ec280aba8ee53f54c99d2a56352
Android Build Merger (Role) [Tue, 6 Jun 2017 16:03:02 +0000 (16:03 +0000)]
Merge "Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev am:
4deefdbe7a am:
39c23689dd"
Ahmed ElArabawy [Tue, 6 Jun 2017 16:01:48 +0000 (16:01 +0000)]
Merge "Revert "Revert "power hal: Use power HAL API 1.1"""
Jayachandran C [Tue, 6 Jun 2017 16:01:01 +0000 (16:01 +0000)]
Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev am:
4deefdbe7a
am:
39c23689dd
Change-Id: I7a4b53fe0a2d2a5a84b43dec9ed34a40fd3f42c7
Keyvan Amiri [Tue, 6 Jun 2017 15:58:43 +0000 (15:58 +0000)]
Merge "Disabled task snapshot for TV" into oc-dev am:
4cddd9a723
am:
1d3a419358
Change-Id: Idf75e8b7871c6e89ef3dbccf917dd54d3e8575bf
Robert Carr [Tue, 6 Jun 2017 15:56:31 +0000 (15:56 +0000)]
Merge "Reinstate SurfaceView Background from N" into oc-dev am:
71044d6ba1
am:
6f0f995120
Change-Id: I69cf4465b8900abea6e4e803b0d2c1cd033a0635
Lucas Dupin [Tue, 6 Jun 2017 15:54:15 +0000 (15:54 +0000)]
Merge "Fix icon tint on notification shelf" into oc-dev am:
285ad4ce66
am:
6b5b7c4d31
Change-Id: I286f4e0881d225a859f465e37a60944fb4427828
Winson Chung [Tue, 6 Jun 2017 15:52:06 +0000 (15:52 +0000)]
Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev am:
5fc8f7d08a
am:
13ec0f2bba
Change-Id: I2deb72fbeb7862ce2b6f0a713e2bc4ac45dcff80
Jeff Sharkey [Tue, 6 Jun 2017 15:48:24 +0000 (15:48 +0000)]
Merge "Annotate @SystemApi with required permissions." into oc-dev am:
c1406978a4
am:
7a2e4a8486
Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
Erik Wolsheimer [Tue, 6 Jun 2017 15:43:39 +0000 (15:43 +0000)]
Merge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am:
7a5dd1c3ff am:
51a89ee90c am:
102b9e5968" into oc-dev-plus-aosp
am:
c382355cc1
Change-Id: Iffb0d2b3bdc8cc5f4c1b3cbd43b3519156fdcd2b
Siarhei Vishniakou [Tue, 6 Jun 2017 15:39:50 +0000 (15:39 +0000)]
Merge "Remove unused variable 'screenon'"
OSDN Git Service
