OSDN Git Service
Amy Zhang [Tue, 29 May 2018 06:00:27 +0000 (06:00 +0000)]
Merge "HdmiCecLocalDeviceTest"
Bernie Innocenti [Tue, 29 May 2018 04:40:37 +0000 (21:40 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW" am:
e03b8ee7e0 am:
0bf54f4a2e
am:
b1883f9abb
Change-Id: Iada367d6083c7dd2724e748bba09a0819c3d0285
Bernie Innocenti [Tue, 29 May 2018 04:29:32 +0000 (21:29 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW" am:
e03b8ee7e0
am:
0bf54f4a2e
Change-Id: Ifa016ce8a4fcb3a43a03d0f1126c01638cbf21ef
Bernie Innocenti [Tue, 29 May 2018 03:35:33 +0000 (20:35 -0700)]
Merge "apf: Increase test coverage of LDDW / STDW"
am:
e03b8ee7e0
Change-Id: Ibc1a443c1c3a34edde835361e538a8d9cb8addb9
Treehugger Robot [Tue, 29 May 2018 02:33:22 +0000 (02:33 +0000)]
Merge "apf: Increase test coverage of LDDW / STDW"
zengjing [Mon, 28 May 2018 19:06:41 +0000 (12:06 -0700)]
Merge "Do not setForceUse when a2dp config without change" am:
8a984b9f08 am:
a49ca727be
am:
d181b01ce3
Change-Id: If5b52f0f80bfd2ea299c3e11068660a14132ce82
zengjing [Mon, 28 May 2018 18:55:55 +0000 (11:55 -0700)]
Merge "Do not setForceUse when a2dp config without change" am:
8a984b9f08
am:
a49ca727be
Change-Id: I9b66aabf3ab2dd8352a9fdb8500384ff6988ab74
zengjing [Mon, 28 May 2018 18:00:16 +0000 (11:00 -0700)]
Merge "Do not setForceUse when a2dp config without change"
am:
8a984b9f08
Change-Id: I644087265717458cb2ffa6bb20d29d90690c0022
Treehugger Robot [Mon, 28 May 2018 17:00:50 +0000 (17:00 +0000)]
Merge "Do not setForceUse when a2dp config without change"
Adrian Roos [Mon, 28 May 2018 14:59:15 +0000 (07:59 -0700)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev am:
8997b7e4c9
am:
40b9c13052
Change-Id: I5fb7dc2c515c20db676f347101838f7624302cf3
Adrian Roos [Mon, 28 May 2018 14:51:31 +0000 (07:51 -0700)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev
am:
8997b7e4c9
Change-Id: Ibe1e0f84a649be077a4bea11ac31b9397b964c48
Adrian Roos [Mon, 28 May 2018 14:40:20 +0000 (14:40 +0000)]
Merge "WindowInsets: Never dispatch negative insets" into pi-dev
Jorim Jaggi [Mon, 28 May 2018 13:02:03 +0000 (06:02 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock" am:
1c3681fe7c am:
34e4c974aa
am:
a093ca0603
Change-Id: Icfbf39aa9d5381ef130c26ab1dfa858c08ce2ce0
Jorim Jaggi [Mon, 28 May 2018 12:53:37 +0000 (05:53 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock" am:
1c3681fe7c
am:
34e4c974aa
Change-Id: I9dcc29873ecb7866343fb733ca700f2a5a757853
Jorim Jaggi [Mon, 28 May 2018 11:59:24 +0000 (04:59 -0700)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
am:
1c3681fe7c
Change-Id: I25a21fb44cddbbee9bc251d13a476a5d9fdfbe90
Jorim Jaggi [Mon, 28 May 2018 10:53:30 +0000 (10:53 +0000)]
Merge "Do not call finishKeyguardDrawn with PWM's mlock"
Hongwei Wang [Sun, 27 May 2018 00:18:44 +0000 (17:18 -0700)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev am:
6de8729657
am:
3a763e30c6
Change-Id: I0a1c145bd5c2af64af39b3884a0c54ee8c8c7cc3
Hongwei Wang [Sun, 27 May 2018 00:06:39 +0000 (17:06 -0700)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
am:
6de8729657
Change-Id: Ia61b80bf582f14108417d640ea135ab51988989a
Hongwei Wang [Sat, 26 May 2018 23:55:19 +0000 (23:55 +0000)]
Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev
Martijn Coenen [Sat, 26 May 2018 09:30:20 +0000 (02:30 -0700)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev am:
879d09f946
am:
a634f425d9
Change-Id: I2fd8ddc6166f00d03a5cefc2d39e477f59a490f0
Martijn Coenen [Sat, 26 May 2018 09:19:18 +0000 (02:19 -0700)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
am:
879d09f946
Change-Id: I02d14f682c6476b703d160dab911a3afc14af627
TreeHugger Robot [Sat, 26 May 2018 09:05:14 +0000 (09:05 +0000)]
Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
Wale Ogunwale [Sat, 26 May 2018 02:57:10 +0000 (19:57 -0700)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev am:
9d19487b1c
am:
9f6c8feb6f
Change-Id: Ia6008e05fe7a7b369be2d9a84bcedc94d74c5334
Wale Ogunwale [Sat, 26 May 2018 02:43:48 +0000 (19:43 -0700)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
am:
9d19487b1c
Change-Id: Ie430137f84f8b6a8d702e4ea5070ded4711da4a8
TreeHugger Robot [Sat, 26 May 2018 02:23:25 +0000 (02:23 +0000)]
Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev
Winson Chung [Sat, 26 May 2018 00:48:47 +0000 (17:48 -0700)]
Merge "Tweak quickscrub bar visuals" into pi-dev am:
e2b602018f
am:
2ad81bb4d9
Change-Id: Ib0aa0b6ad410f6356954e7f0fff322e511807f89
Winson Chung [Sat, 26 May 2018 00:37:53 +0000 (17:37 -0700)]
Merge "Tweak quickscrub bar visuals" into pi-dev
am:
e2b602018f
Change-Id: Ie1cc36c9aaa35641deac620d7e5df50c9fc4e033
Winson Chung [Sat, 26 May 2018 00:26:59 +0000 (00:26 +0000)]
Merge "Tweak quickscrub bar visuals" into pi-dev
Robert Shih [Fri, 25 May 2018 23:26:00 +0000 (16:26 -0700)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev am:
300ab58e9a
am:
5ecf175573
Change-Id: Iaecb78eca49f32d155ea856630d6299b8604d8fc
Robert Shih [Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
am:
300ab58e9a
Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10
TreeHugger Robot [Fri, 25 May 2018 23:01:53 +0000 (23:01 +0000)]
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
Jason Monk [Fri, 25 May 2018 22:34:58 +0000 (15:34 -0700)]
Merge "Final cleanups to permission slices" into pi-dev am:
64a33d695d
am:
3f3f1ebc17
Change-Id: I075703514267496004435b984733133c3a8887bf
Amy [Thu, 24 May 2018 21:36:25 +0000 (14:36 -0700)]
HdmiCecLocalDeviceTest
Test: atest com.android.server.hdmi
Change-Id: Ic051138202531871b6227d57ef35038d0971e9e5
Jason Monk [Fri, 25 May 2018 22:26:03 +0000 (15:26 -0700)]
Merge "Final cleanups to permission slices" into pi-dev
am:
64a33d695d
Change-Id: I3256c8ca665ede11bab55072cddb8598c1d3b51b
Selim Cinek [Fri, 25 May 2018 22:17:16 +0000 (15:17 -0700)]
Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am:
c0797c85e9" into pi-dev-plus-aosp
am:
521450a50c
Change-Id: Ib8bbcd4c934348e0e688c331b90c2c49d445ba0e
TreeHugger Robot [Fri, 25 May 2018 22:10:20 +0000 (22:10 +0000)]
Merge "Final cleanups to permission slices" into pi-dev
Bryan Henry [Fri, 25 May 2018 22:03:19 +0000 (15:03 -0700)]
[automerger skipped] Merge "Allow changing signing cert for system apps that use shared users" am:
f98f8a4c6c am:
cb39c1a9ef -s ours
am:
934df382cc -s ours
Change-Id: Ibbd9d039bb6067a156ca26787136e30d8bb1e4e4
Android Build Merger (Role) [Fri, 25 May 2018 21:53:50 +0000 (21:53 +0000)]
Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am:
c0797c85e9" into pi-dev-plus-aosp
Selim Cinek [Fri, 25 May 2018 21:53:16 +0000 (14:53 -0700)]
Merge "Fix IME displayed behind the notification shade" into pi-dev
am:
c0797c85e9
Change-Id: I4adfe6e0f61e934cfd2e422844338cf2984c757b
Bryan Henry [Fri, 25 May 2018 21:53:07 +0000 (14:53 -0700)]
[automerger skipped] Merge "Allow changing signing cert for system apps that use shared users" am:
f98f8a4c6c
am:
cb39c1a9ef -s ours
Change-Id: I6075b3b4ab6d204cce51d55ed86ae9df97ddca9d
Bryan Henry [Fri, 25 May 2018 21:42:16 +0000 (14:42 -0700)]
Merge "Allow changing signing cert for system apps that use shared users"
am:
f98f8a4c6c
Change-Id: Iccd2ec46ab087d2dc31afa255ea8dc9f49897b79
Selim Cinek [Fri, 25 May 2018 21:33:42 +0000 (21:33 +0000)]
Merge "Fix IME displayed behind the notification shade" into pi-dev
Julia Reynolds [Fri, 25 May 2018 21:31:59 +0000 (14:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE Update volume dialog colors" into pi-dev am:
aa8391d544
am:
75d5e40387 -s ours
Change-Id: I7454dcba5e3162db8c9da02aa1fc829df8549ca8
Julia Reynolds [Fri, 25 May 2018 21:19:55 +0000 (14:19 -0700)]
Merge "DO NOT MERGE Update volume dialog colors" into pi-dev
am:
aa8391d544
Change-Id: Ib5c23f8f1ad2866ddd796e4a0e7b522734d9e5f5
TreeHugger Robot [Fri, 25 May 2018 21:05:55 +0000 (21:05 +0000)]
Merge "DO NOT MERGE Update volume dialog colors" into pi-dev
Winson Chung [Thu, 24 May 2018 21:21:57 +0000 (14:21 -0700)]
Tweak quickscrub bar visuals
- Thicker asset, scale track slightly on gesture start/end
Bug:
79945202
Test: Quickscrub and see changes
Change-Id: Ic7ae11981ae79cd909d919a326ecc5126cbb399f
Lin Guo [Fri, 25 May 2018 20:40:16 +0000 (13:40 -0700)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev am:
4651a6cb72
am:
2f72f4e723
Change-Id: Ia9252c4a93a379e5b98f23da57a4ad260db45bdd
Lin Guo [Fri, 25 May 2018 20:30:49 +0000 (13:30 -0700)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
am:
4651a6cb72
Change-Id: I769a4f5b1d3db8848c82d57fd0931980544c22b3
Selim Cinek [Fri, 25 May 2018 20:30:42 +0000 (13:30 -0700)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev am:
c4e19963f4
am:
7712d46760
Change-Id: Ib07dc6354fb3a5fa5ff6171d1c656634465b29fa
Selim Cinek [Fri, 25 May 2018 20:21:38 +0000 (13:21 -0700)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
am:
c4e19963f4
Change-Id: I7e5feadc253816852528e06719e136a7cba51c49
Bryan Henry [Fri, 25 May 2018 20:21:23 +0000 (20:21 +0000)]
Merge "Allow changing signing cert for system apps that use shared users"
TreeHugger Robot [Fri, 25 May 2018 20:16:54 +0000 (20:16 +0000)]
Merge "Apply tint to the Volume Dialog primary and supplement icon" into pi-dev
Selim Cinek [Fri, 25 May 2018 20:06:52 +0000 (20:06 +0000)]
Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
Julia Reynolds [Wed, 23 May 2018 13:45:53 +0000 (09:45 -0400)]
DO NOT MERGE Update volume dialog colors
Test: manual
Fixes:
79699643
Change-Id: I73bde7f30a9aad5b7c084d37987f808df342cc75
Jason Monk [Fri, 25 May 2018 19:13:16 +0000 (15:13 -0400)]
Final cleanups to permission slices
- Add icons to the right and shortcut modes
- Add color
- Make sure dialogs are secure
Test: manual
Bug:
79960669
Change-Id: I6d251b0ea5bd3c1b3eed32b184e4aae22c52ffb5
Suprabh Shukla [Fri, 25 May 2018 19:38:55 +0000 (12:38 -0700)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev am:
3d70d20c88
am:
5ae610751f
Change-Id: Ica6f802d6ff6254a70feee45bc20a9f50617c68a
Suprabh Shukla [Fri, 25 May 2018 19:30:07 +0000 (12:30 -0700)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
am:
3d70d20c88
Change-Id: I4f03288f78bb89a7940f5757373c97ea0ca407db
TreeHugger Robot [Fri, 25 May 2018 19:17:33 +0000 (19:17 +0000)]
Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev
Tracy Zhou [Fri, 25 May 2018 19:16:08 +0000 (12:16 -0700)]
Merge "Do not truncate onboarding tip text." into pi-dev am:
8ac5fc68a9
am:
522c4f7e4c
Change-Id: I0f7489fc5adbf1e6af2376333ab43dee5fdf920b
Tracy Zhou [Fri, 25 May 2018 19:06:44 +0000 (12:06 -0700)]
Merge "Do not truncate onboarding tip text." into pi-dev
am:
8ac5fc68a9
Change-Id: I0d60205f76d774d670111981714718611e0dafcf
Robert Shih [Fri, 25 May 2018 18:42:22 +0000 (11:42 -0700)]
Add cleartextTrafficPermitted to MediaFrameworkTest
Bug:
75276616
Test: this
Change-Id: I520950a148658e9f1602e1b4657dd0273bdaf0e2
TreeHugger Robot [Fri, 25 May 2018 18:51:40 +0000 (18:51 +0000)]
Merge "Do not truncate onboarding tip text." into pi-dev
Tracy Zhou [Fri, 25 May 2018 18:37:50 +0000 (11:37 -0700)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev am:
78766d2901
am:
23f89fa7b4
Change-Id: Ica56057785e45afd71620bc2f49f2ab648642cc9
Tetsutoki Shiozawa [Fri, 25 May 2018 18:24:59 +0000 (11:24 -0700)]
[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am:
4517eacd5d am:
356edc5fe4 -s ours
am:
9a66c53711 -s ours
Change-Id: Iaa4b1f2ce6bdc1139fae501ec60c282ca4609396
Tracy Zhou [Fri, 25 May 2018 18:17:36 +0000 (11:17 -0700)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev
am:
78766d2901
Change-Id: Ibdaf788a47791bd1b44d557f852f86d0253b393f
Martijn Coenen [Fri, 25 May 2018 17:28:26 +0000 (19:28 +0200)]
Dump proxy debug info when exceeding proxy limit.
If a process gets killed because it sends too many proxies,
dump proxy debug info so we can see what types of interfaces
it sends.
Bug:
71353150
Test: builds, output generated
Change-Id: I3a7787cb3fa73b0b4ad223b18cd79f44e22b9ef5
Tetsutoki Shiozawa [Fri, 25 May 2018 18:12:35 +0000 (11:12 -0700)]
[automerger skipped] Merge "Fix: ConnectivityManager is initialized with a wrong context" am:
4517eacd5d
am:
356edc5fe4 -s ours
Change-Id: Ibdbd1d7b667506ac14b8cc487d17d11f82a993b0
TreeHugger Robot [Fri, 25 May 2018 18:06:07 +0000 (18:06 +0000)]
Merge "Support rtl for quick scrub onboarding text." into pi-dev
Tetsutoki Shiozawa [Fri, 25 May 2018 18:01:09 +0000 (11:01 -0700)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
am:
4517eacd5d
Change-Id: I0629b33b8cc5e155b4500cc15901985dbf0a31f2
sanryhuang [Fri, 25 May 2018 04:34:31 +0000 (12:34 +0800)]
Fix IME displayed behind the notification shade
The Back key isn't dispatched to IME. Refine the logic of onKeyPreIme.
Test: manual test
Test: atest
Change-Id: I6cf5402e70e91d74e5843beb390b306146159e4d
Fixes:
80250543
Wale Ogunwale [Fri, 25 May 2018 01:25:25 +0000 (18:25 -0700)]
Added TestApi to ActivityInfo.isTranslucentOrFloating
This would be use to determine the right activity state during CTS
test for products that have windowSwipeToDismiss set.
Also, dump ActivityRecord.fullscreen to proto for the same reason.
Bug:
76207986
Bug:
79167358
Test: atest CtsActivityManagerDeviceTestCases:ActivityLifecycleTests
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerAssistantStackTests
Change-Id: Iadc088e9129be088b8a083ebbafd8d20fe26b673
TreeHugger Robot [Fri, 25 May 2018 17:05:31 +0000 (17:05 +0000)]
Merge "Switch to the previous IME switcher dialog title"
Treehugger Robot [Fri, 25 May 2018 16:42:59 +0000 (16:42 +0000)]
Merge "Fix: ConnectivityManager is initialized with a wrong context"
Mihai Popa [Fri, 25 May 2018 16:21:29 +0000 (09:21 -0700)]
[automerger skipped] Merge "Fix monkey crash in smart selection animation" into pi-dev am:
1ffdec20b4
am:
3b88884d91 -s ours
Change-Id: Idbdce925f874763d8d5bd990e4d0ec48ee481a00
Selim Cinek [Wed, 23 May 2018 23:46:05 +0000 (16:46 -0700)]
Fixed the behavior of group conversations when targeting P
Fixes an issue where the group conversation heuristic was still
applied even when the app is targeting P. We're now following
the isGroupConversation completely and only do the migration
for apps targeting < P.
Change-Id: I471d58e8a8f5e6270f0dcce8691d08a2bdd1c582
Fixes:
78450835
Test: add messaging notification, observe correct display
Mihai Popa [Fri, 25 May 2018 16:12:52 +0000 (09:12 -0700)]
Merge "Fix monkey crash in smart selection animation" into pi-dev
am:
1ffdec20b4
Change-Id: Idbc82d56568d65542d189c84954c3c3f7cd7aea9
TreeHugger Robot [Fri, 25 May 2018 15:59:07 +0000 (15:59 +0000)]
Merge "Fix monkey crash in smart selection animation" into pi-dev
Shuzhen Wang [Fri, 25 May 2018 15:52:47 +0000 (08:52 -0700)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev am:
568ccfe0b6
am:
5116500c9d
Change-Id: I3fcea94d5f0cbccef69e45a6ccd98f1f60ed989b
Shuzhen Wang [Fri, 25 May 2018 15:40:55 +0000 (08:40 -0700)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev
am:
568ccfe0b6
Change-Id: I1e118301f74e407fa2e23557c2a5f1a77882ef18
TreeHugger Robot [Fri, 25 May 2018 15:27:43 +0000 (15:27 +0000)]
Merge "Camera: Clarify multi-camera id selection logic" into pi-dev
Tetsutoki Shiozawa [Mon, 19 Feb 2018 01:24:43 +0000 (10:24 +0900)]
Fix: ConnectivityManager is initialized with a wrong context
ActivityThread#setHttpProxy uses a system context to get
a ConnectivityManager instance. If it's not already cached, the
system service registry will cache this instance initialized
with the system context, and subsequent calls to get this service
will return the bad instance.
This patch uses the application context instead, unless it's
not available for some unlikely reason.
A possible symptom of this issue is to have Bluetooth tethering
failing with a security exception, because it's requested by
the "android" package without system uid.
Merged-In: Ib8815f010883cdb94fcad2cdfb237de39327b20a
Bug:
73572062
Change-Id: Id652c1625194dc73dcbf8dfcad4b4e2e6fbebf4e
Nicolas Geoffray [Fri, 25 May 2018 14:04:18 +0000 (07:04 -0700)]
Merge "Add one telephony API to light grey." into pi-dev am:
a764186455
am:
6ae189cb87
Change-Id: Ia44b0a830925404801b8d484fb90a849fbde01b3
Mihai Popa [Fri, 25 May 2018 10:57:17 +0000 (11:57 +0100)]
Fix monkey crash in smart selection animation
In Id65443e93d277c106ea955c867d39e94192cc55d we fixed a monkey crash
happening when the smart selected text had changed while the smart
selection animation was running. However, the change introduced a new
crash, happening when the smart selection result was null. This CL fixes
it, and lets startSelectionActionMode run even when the result is null,
as there seems to be some logic there which should happen in this case.
Bug:
80244201
Test: none
Change-Id: I7f0304446dec85578bdcd5011d2e9ea2737d3c36
(cherry picked from commit
a9d27ea8692dbf6c6def6bd21754af0ad67d1675)
Merged-in: I7f0304446dec85578bdcd5011d2e9ea2737d3c36
Nicolas Geoffray [Fri, 25 May 2018 13:57:10 +0000 (06:57 -0700)]
Merge "More light grey apis." into pi-dev am:
1b32d34457
am:
86c9e52d6f
Change-Id: Ia59f3cd6699d1200e3b592645db1f8ca8cea959b
Nicolas Geoffray [Fri, 25 May 2018 13:55:59 +0000 (06:55 -0700)]
Merge "Add one telephony API to light grey." into pi-dev
am:
a764186455
Change-Id: I6d797c061dc2b7685bc8892065892b38cd932750
Mihai Popa [Fri, 25 May 2018 13:49:22 +0000 (13:49 +0000)]
Merge "Fix monkey crash in smart selection animation"
Nicolas Geoffray [Fri, 25 May 2018 13:47:16 +0000 (06:47 -0700)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev am:
83ee75a2de
am:
cefe9ae68f
Change-Id: I9e5234167c95f37ded4fad21ece3663343be0837
Nicolas Geoffray [Fri, 25 May 2018 13:46:31 +0000 (13:46 +0000)]
Merge "Add one telephony API to light grey." into pi-dev
Nicolas Geoffray [Fri, 25 May 2018 13:43:39 +0000 (06:43 -0700)]
Merge "More light grey apis." into pi-dev
am:
1b32d34457
Change-Id: I5f43a4d569c4965e3530f856d19e51099c616f75
Nicolas Geoffray [Fri, 25 May 2018 13:38:36 +0000 (06:38 -0700)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev
am:
83ee75a2de
Change-Id: I3fd7534da5fd815d8a9f3871ef8d0bbda85db7b4
TreeHugger Robot [Fri, 25 May 2018 13:36:21 +0000 (13:36 +0000)]
Merge "Cleanup Bitmap#recycle"
Nicolas Geoffray [Fri, 25 May 2018 13:30:19 +0000 (13:30 +0000)]
Merge "More light grey apis." into pi-dev
Nicolas Geoffray [Fri, 25 May 2018 13:29:55 +0000 (13:29 +0000)]
Merge "Add SharedPreferencesImpl;->startLoadFromDisk()V to light grey." into pi-dev
Adrian Roos [Thu, 24 May 2018 16:20:51 +0000 (18:20 +0200)]
WindowInsets: Never dispatch negative insets
Bug:
80204753
Test: atest ViewRootImplTest
Change-Id: Idace95ae57c6a3a1667b95ce8c3ac7d2bfe06f94
Leon Scroggins III [Thu, 24 May 2018 19:29:07 +0000 (15:29 -0400)]
Remove unused refSkPixelRef
Test: Build
Change-Id: Iac21b08217113787765b5be611f7e1e66b317904
Jiyong Park [Fri, 25 May 2018 12:11:27 +0000 (05:11 -0700)]
[automerger skipped] Merge changes from topic "location_provider" am:
79b473ed7b am:
77390bf307 -s ours
am:
6a2ccc107c -s ours
Change-Id: I4063ae283ea8ef0a43957bb5e1aaf68a14c63416
Nicolas Geoffray [Fri, 25 May 2018 11:52:03 +0000 (04:52 -0700)]
Merge "Add more light grey APIs." into pi-dev am:
32256ceb22
am:
ade5c9c811
Change-Id: I6956f7a916b4d9686d4b1f1a6e25e1f96a12c7b2
Jiyong Park [Fri, 25 May 2018 11:26:20 +0000 (04:26 -0700)]
[automerger skipped] Merge changes from topic "location_provider" am:
79b473ed7b
am:
77390bf307 -s ours
Change-Id: I5ef31499bd1e21237fa8a1752c035ae8341235b9
Jiyong Park [Fri, 25 May 2018 11:17:49 +0000 (04:17 -0700)]
Merge changes from topic "location_provider"
am:
79b473ed7b
Change-Id: I9a9985fd18db00d510ebae9e0dec69d6647a2332
Nicolas Geoffray [Fri, 25 May 2018 11:01:25 +0000 (04:01 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
32256ceb22
Change-Id: I1ffe50fb847f8986b41fabe9ee0c41fb72558ed9
OSDN Git Service
