OSDN Git Service
David Brazdil [Fri, 9 Mar 2018 15:18:33 +0000 (15:18 +0000)]
Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev am:
f8a69fdd7a
am:
e6fd257d5b
Change-Id: Id52fa07c1eb1e2f5aa3b4c6548cb9574a10dc962
Vladislav Kaznacheev [Fri, 9 Mar 2018 15:03:02 +0000 (15:03 +0000)]
Merge "Display shortcut inline with item title in cascading menu" into pi-dev am:
ae957a780e
am:
a26f82e9af
Change-Id: I3b6b532736a12b10ec0646608832216266c8c378
Hyundo Moon [Fri, 9 Mar 2018 14:51:52 +0000 (14:51 +0000)]
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev am:
5cef8984ba
am:
2006407144
Change-Id: I5cff047f7200ed85424c473ffd699fcc2f3bddbb
yro [Fri, 9 Mar 2018 14:39:29 +0000 (14:39 +0000)]
Merge "Add team members in OWNER file" into pi-dev am:
3ce208c1e9
am:
8d62b9dd9e
Change-Id: Ic808129c80c5f019cbcbc0578c2a385c76d41829
David Brazdil [Fri, 9 Mar 2018 14:33:02 +0000 (14:33 +0000)]
Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev
am:
f8a69fdd7a
Change-Id: I2c7142fb2e121c38dcbbadc730933ad4993468e1
Kweku Adams [Fri, 9 Mar 2018 14:31:22 +0000 (14:31 +0000)]
Merge "Documenting some core proto style conventions." into pi-dev am:
df9737d286
am:
cddeb74c30
Change-Id: I8b51d3284f0649587e848d49f69ee044375e12de
Vladislav Kaznacheev [Fri, 9 Mar 2018 14:29:00 +0000 (14:29 +0000)]
Merge "Display shortcut inline with item title in cascading menu" into pi-dev
am:
ae957a780e
Change-Id: I484cb6f01191ac5ce044fd94f7e32970aec2dfb1
Wale Ogunwale [Fri, 9 Mar 2018 14:21:00 +0000 (14:21 +0000)]
Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev am:
e8b15263e0
am:
2d6384edd7
Change-Id: I128352ed77e6b9d4b50c051ba6cb99437b81112b
Hyundo Moon [Fri, 9 Mar 2018 14:20:47 +0000 (14:20 +0000)]
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev
am:
5cef8984ba
Change-Id: I93c7e277ceb5e0dcfef02d279d8334bc0ded4d98
yro [Fri, 9 Mar 2018 14:15:52 +0000 (14:15 +0000)]
Merge "Add team members in OWNER file" into pi-dev
am:
3ce208c1e9
Change-Id: I52077ca3dfc9a36c29c03b3a39998502f05f4e55
Kweku Adams [Fri, 9 Mar 2018 14:10:58 +0000 (14:10 +0000)]
Merge "Documenting some core proto style conventions." into pi-dev
am:
df9737d286
Change-Id: I9bbef2a5c5b9d37d4a4e719032203c31a21bf3d3
Wale Ogunwale [Fri, 9 Mar 2018 14:05:31 +0000 (14:05 +0000)]
Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev
am:
e8b15263e0
Change-Id: I51cc911290bd46dcab725c8a31685d464b014098
Chalard Jean [Fri, 9 Mar 2018 13:38:55 +0000 (13:38 +0000)]
Merge "Deprecate most of NetworkInfo." am:
92a9847de9 am:
c8b846e1ac
am:
fdcef03493
Change-Id: I2abea53dc69ca2f49eeb17da040919d0d600917c
Chalard Jean [Fri, 9 Mar 2018 13:12:08 +0000 (13:12 +0000)]
Merge "Deprecate most of NetworkInfo." am:
92a9847de9
am:
c8b846e1ac
Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1
Chalard Jean [Fri, 9 Mar 2018 12:57:15 +0000 (12:57 +0000)]
Merge "Deprecate most of NetworkInfo."
am:
92a9847de9
Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
Mihai Popa [Fri, 9 Mar 2018 12:52:15 +0000 (12:52 +0000)]
Merge changes from topic "magnifier_expose_size_and_zoom"
* changes:
[Magnifier-33] Add animation on line jump
[Magnifier-32] Do not magnify outside selection
[Magnifier-31] Do not magnify outside current line
[Magnifier-29] Expose size and zoom in the API
TreeHugger Robot [Fri, 9 Mar 2018 10:46:27 +0000 (10:46 +0000)]
Merge "Fix StaticLayout maxLineHeight warning"
Erik Kline [Fri, 9 Mar 2018 10:14:21 +0000 (10:14 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." am:
59787b4247 am:
30563dee52
am:
4ea65c2f00
Change-Id: Ib0c4b69a24144d27f672ec716fb9a8f06987ce7d
David Brazdil [Fri, 9 Mar 2018 10:07:41 +0000 (10:07 +0000)]
Merge "Whitelist all @SystemApi and @TestApi for hidden API" into pi-dev
Chalard Jean [Fri, 9 Mar 2018 09:46:11 +0000 (09:46 +0000)]
Merge "Deprecate most of NetworkInfo."
Jaewan Kim [Fri, 9 Mar 2018 09:42:38 +0000 (09:42 +0000)]
Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev am:
790a31ee31
am:
9331c2d555
Change-Id: I08124bd3175a5f49953311ba28eda1424f0fcf83
Mathieu Chartier [Fri, 9 Mar 2018 09:23:48 +0000 (09:23 +0000)]
Merge changes from topic "cdex_commands" into pi-dev am:
041b38479d -s ours
am:
d7972bd19e -s ours
Change-Id: I761f04edbcb05d935af21ce18726200b8ed4dcd3
TreeHugger Robot [Fri, 9 Mar 2018 09:22:54 +0000 (09:22 +0000)]
Merge "Display shortcut inline with item title in cascading menu" into pi-dev
Makoto Onuki [Fri, 9 Mar 2018 09:17:47 +0000 (09:17 +0000)]
Merge "Add global setting for auto-battery saver threshold max" into pi-dev am:
fa63f6895b
am:
03c48c3dab
Change-Id: I35ced83414a91ef6db9df2534f7e93ae200690c8
Hyundo Moon [Fri, 9 Mar 2018 08:28:08 +0000 (08:28 +0000)]
Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev
Winson Chung [Fri, 9 Mar 2018 08:17:07 +0000 (08:17 +0000)]
Merge "Don't hold AM lock during assist data request." into pi-dev am:
4d270b6d19
am:
9dae666322
Change-Id: I643d72851abafc1530cb3b4d3b23fabc09b18f51
Bookatz [Fri, 9 Mar 2018 08:10:11 +0000 (08:10 +0000)]
Merge "Fix statsd crash due to bad bucket index" into pi-dev am:
7ad26e4bad
am:
06832e0c68
Change-Id: Icebf2c5392cd79d0f8677452b04945507c92597d
Etan Cohen [Fri, 9 Mar 2018 08:01:55 +0000 (08:01 +0000)]
Merge "[RTT] COARSE -> FINE permission requirements" into pi-dev am:
f5435948d8
am:
8b39af58fc
Change-Id: Ib4684d436a14f60fbae05e53f5a9d556d27561ef
Wei Jia [Fri, 9 Mar 2018 07:55:09 +0000 (07:55 +0000)]
Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev am:
af6cb35749
am:
004f53709d
Change-Id: Id2e9482736df2ecbb57145af889859cb0c03f378
Jack He [Fri, 9 Mar 2018 07:45:23 +0000 (07:45 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name" into pi-dev am:
7c90773053
am:
ab25bd1372
Change-Id: If8f72ca947f70abd05e8260b6018eb8cb4a2e015
Tarandeep Singh [Fri, 9 Mar 2018 07:38:36 +0000 (07:38 +0000)]
Merge "Remove debug metadata isVrOnly from InputMethodInfo" into pi-dev am:
961e147b66
am:
5e3d9f5101
Change-Id: Ia6468be994deaf5072f09f3126492f594ca84d90
TreeHugger Robot [Fri, 9 Mar 2018 07:37:43 +0000 (07:37 +0000)]
Merge "Add team members in OWNER file" into pi-dev
yro [Fri, 9 Mar 2018 02:41:03 +0000 (18:41 -0800)]
Add team members in OWNER file
Bug:
74415902
Test: no test necessary
Change-Id: I39d0a5cb9c6e8520fd29881442e66961096d52fc
Tarandeep Singh [Fri, 9 Mar 2018 07:31:01 +0000 (07:31 +0000)]
Merge "Make few of the new IMS API methods final" into pi-dev am:
8e64eee8dc
am:
7dba49739b
Change-Id: I5f788d0bb3cc57847889024cb8262c5af7eaba5d
Erik Kline [Fri, 9 Mar 2018 07:24:30 +0000 (07:24 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." am:
59787b4247
am:
30563dee52
Change-Id: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
Changwan Ryu [Fri, 9 Mar 2018 07:24:01 +0000 (07:24 +0000)]
Merge "Expose WebView#onCheckIsTextEditor" into pi-dev am:
ebe856a90e
am:
dd6ec01ece
Change-Id: Ie4f325be83b747c3cefe77b42bfdd9f05336edcf
Yi Jin [Fri, 9 Mar 2018 07:04:18 +0000 (07:04 +0000)]
Merge "Optimize incidentd memory usage" into pi-dev am:
12fa6b4ff6
am:
7406b66072
Change-Id: I429ec5a6860646aac1104da2e9af3858426835c2
Jaewan Kim [Fri, 9 Mar 2018 07:04:03 +0000 (07:04 +0000)]
Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev
am:
790a31ee31
Change-Id: I8240c7c4a1ab0e80d9253a728ac8fa33b1b5535c
Erik Kline [Fri, 9 Mar 2018 07:01:21 +0000 (07:01 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback."
am:
59787b4247
Change-Id: I63d8b36ec1594134bce8c60eb653e9b53a1b1963
yro [Fri, 9 Mar 2018 06:57:11 +0000 (06:57 +0000)]
Merge "Write data to file when StatsCompanionSerivice (system_server) crashes" into pi-dev am:
ec66e9e726
am:
ec01ab9e68
Change-Id: I20f34d4ee54caed25ca59aa7f30bec2aed145101
Mathieu Chartier [Fri, 9 Mar 2018 06:49:34 +0000 (06:49 +0000)]
Merge changes from topic "cdex_commands" into pi-dev
am:
041b38479d -s ours
Change-Id: Ic5a5df89536a53b68f462478d394874f691a8fe8
Fyodor Kupolov [Fri, 9 Mar 2018 06:48:29 +0000 (06:48 +0000)]
Merge "Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into oc-dev am:
b6b6c01847 am:
bdc573b39b am:
d258da6a80" into pi-dev am:
0aa191ccbf
am:
fd6dd3848a
Change-Id: Id05ea2bf72e3e5350603d2f5158e3fefc097e426
Makoto Onuki [Fri, 9 Mar 2018 06:45:00 +0000 (06:45 +0000)]
Merge "Add global setting for auto-battery saver threshold max" into pi-dev
am:
fa63f6895b
Change-Id: Id4e36e3c2b1eb5ab57cd491f71f7ddd5f1736fe3
Winson Chung [Fri, 9 Mar 2018 06:40:25 +0000 (06:40 +0000)]
Merge "Don't hold AM lock during assist data request." into pi-dev
am:
4d270b6d19
Change-Id: I078a3353667dec6895bdf66e768ebc6019d3ef4e
Chalard Jean [Thu, 8 Mar 2018 04:54:53 +0000 (13:54 +0900)]
Deprecate most of NetworkInfo.
getType, getTypeName, isConnectedOrConnecting, isConnected,
isAvaisable, isFailover, isRoaming, getState, getDetailedState,
getReason, and the TYPE_* constants in ConnectivityManager
along with methods that use them are now stacked on a boat
bound for the other side of the Styx.
Test: no code changes
Bug:
62844794
Change-Id: Idd70763de5b1af5580b4734cd443ac4b570069cc
Bookatz [Fri, 9 Mar 2018 06:35:58 +0000 (06:35 +0000)]
Merge "Fix statsd crash due to bad bucket index" into pi-dev
am:
7ad26e4bad
Change-Id: I7ca80eda49b401ea3eb2b045f0e6797d640c584e
Etan Cohen [Fri, 9 Mar 2018 06:30:34 +0000 (06:30 +0000)]
Merge "[RTT] COARSE -> FINE permission requirements" into pi-dev
am:
f5435948d8
Change-Id: I0d5e35ffad577274547c7dd6bd9b2daaa4932b00
Wei Jia [Fri, 9 Mar 2018 06:25:34 +0000 (06:25 +0000)]
Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev
am:
af6cb35749
Change-Id: Ica02002122fe7b5eb579482091336ed87a5dad20
Amin Shaikh [Fri, 9 Mar 2018 06:21:50 +0000 (06:21 +0000)]
Merge "Add secondary text to mobile data tile." into pi-dev am:
24d888aab6
am:
96e99cbc8d
Change-Id: I370a3d2ca7455867a21f5959f381194c42d6b65d
Jack He [Fri, 9 Mar 2018 06:20:39 +0000 (06:20 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name" into pi-dev
am:
7c90773053
Change-Id: I75af57c064120e3bb6ed6e55c6bb0058d964020a
Tarandeep Singh [Fri, 9 Mar 2018 06:15:31 +0000 (06:15 +0000)]
Merge "Remove debug metadata isVrOnly from InputMethodInfo" into pi-dev
am:
961e147b66
Change-Id: I0554b89a05a528178329874a8afa1f5cdc10a58b
Rohan Shah [Fri, 9 Mar 2018 06:11:29 +0000 (06:11 +0000)]
Merge "[QS] Disable hotspot when data saver is enabled" into pi-dev am:
92078d34fb
am:
d0e848930e
Change-Id: I12069f8e1011d88185784ed0c551fbbb197386e6
Tarandeep Singh [Fri, 9 Mar 2018 06:10:43 +0000 (06:10 +0000)]
Merge "Make few of the new IMS API methods final" into pi-dev
am:
8e64eee8dc
Change-Id: Iba222fe7e0752b7161e82b77d28dbe636f1bca7a
Changwan Ryu [Fri, 9 Mar 2018 06:05:45 +0000 (06:05 +0000)]
Merge "Expose WebView#onCheckIsTextEditor" into pi-dev
am:
ebe856a90e
Change-Id: I1aa2c3d27c4b11248451aec3723d4eeef8bdbb90
Yi Jin [Fri, 9 Mar 2018 06:00:51 +0000 (06:00 +0000)]
Merge "Optimize incidentd memory usage" into pi-dev
am:
12fa6b4ff6
Change-Id: I6ccbb8675002c93c3894220d12597d6fc4c63153
yro [Fri, 9 Mar 2018 05:55:57 +0000 (05:55 +0000)]
Merge "Write data to file when StatsCompanionSerivice (system_server) crashes" into pi-dev
am:
ec66e9e726
Change-Id: Ia283c7058e7f5a0e6935d1b1dea38a8e3d59d775
Fyodor Kupolov [Fri, 9 Mar 2018 05:50:54 +0000 (05:50 +0000)]
Merge "Merge changes from topic "am-
74e79eb6-59c1-4f9c-a993-
72eeee3859c4" into oc-dev am:
b6b6c01847 am:
bdc573b39b am:
d258da6a80" into pi-dev
am:
0aa191ccbf
Change-Id: I6e20bd7cb9a86305a1c052ecb6d139e35ed803ca
Jack He [Fri, 9 Mar 2018 05:39:01 +0000 (05:39 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name" am:
1844f1cb43 am:
2981516215
am:
fa6c2d0e64
Change-Id: I38d4f94a3ec7f49e9a02016df7b5971eca1b85c8
Amin Shaikh [Fri, 9 Mar 2018 05:25:36 +0000 (05:25 +0000)]
Merge "Add secondary text to mobile data tile." into pi-dev
am:
24d888aab6
Change-Id: Ic9abbff2accf84a2b3d9095f2615cf92252cdb65
Rohan Shah [Fri, 9 Mar 2018 05:20:37 +0000 (05:20 +0000)]
Merge "[QS] Disable hotspot when data saver is enabled" into pi-dev
am:
92078d34fb
Change-Id: I50a0ef8e7dfcf3127fb4b68fd7f0093a726d36e9
Mathieu Chartier [Fri, 9 Mar 2018 05:20:25 +0000 (05:20 +0000)]
Merge "Clean up comment" am:
8cdc0da9ad am:
f1a2f4098b
am:
71013c25ee
Change-Id: Id4750152a82a792ea2c3c2fe3654a642a2eb51ed
TreeHugger Robot [Fri, 9 Mar 2018 05:15:28 +0000 (05:15 +0000)]
Merge "Documenting some core proto style conventions." into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 05:13:22 +0000 (05:13 +0000)]
Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev
Hyundo Moon [Mon, 5 Mar 2018 04:41:01 +0000 (13:41 +0900)]
MediaSession2: Ensure NonNull/Nullable for parameters of public methods
Bug:
73863865
Test: runtest-MediaComponents
Change-Id: Id40f221ae60b1e63afd9ff71950589fe13a7f526
Erik Kline [Fri, 9 Mar 2018 04:49:51 +0000 (04:49 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback."
TreeHugger Robot [Fri, 9 Mar 2018 04:37:29 +0000 (04:37 +0000)]
Merge "MediaSession2: Implement MediaSession2#updatePlayer()" into pi-dev
Mathieu Chartier [Fri, 9 Mar 2018 04:27:18 +0000 (04:27 +0000)]
Merge changes from topic "cdex_commands" into pi-dev
* changes:
Clean up comment
Bump version for OtaDexoptService
Add logic for passing down CompactDex generation flag
Jack He [Fri, 9 Mar 2018 04:14:55 +0000 (04:14 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name" am:
1844f1cb43
am:
2981516215
Change-Id: Id15957903f0519e48cfc2386a1a2779e443ef190
TreeHugger Robot [Fri, 9 Mar 2018 03:51:41 +0000 (03:51 +0000)]
Merge "Add global setting for auto-battery saver threshold max" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 03:39:31 +0000 (03:39 +0000)]
Merge "Don't hold AM lock during assist data request." into pi-dev
Mathieu Chartier [Fri, 9 Mar 2018 03:32:09 +0000 (03:32 +0000)]
Merge "Clean up comment" am:
8cdc0da9ad
am:
f1a2f4098b
Change-Id: I6a669438e5f1597d74c4411920084455c5e83931
TreeHugger Robot [Fri, 9 Mar 2018 03:23:17 +0000 (03:23 +0000)]
Merge "Fix statsd crash due to bad bucket index" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 03:19:50 +0000 (03:19 +0000)]
Merge "[RTT] COARSE -> FINE permission requirements" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 03:10:41 +0000 (03:10 +0000)]
Merge "MediaPlayer2Impl: fix getPlayerState." into pi-dev
Tyler Gunn [Fri, 9 Mar 2018 03:10:21 +0000 (03:10 +0000)]
Merge "New intent for microphone mute change notification" am:
d34cd5eb0a am:
ffa845d141 -s ours
am:
290514b6da -s ours
Change-Id: I3d8130122022044097cf05773031cfc50be6dd05
TreeHugger Robot [Fri, 9 Mar 2018 03:02:22 +0000 (03:02 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 02:53:23 +0000 (02:53 +0000)]
Merge "Remove debug metadata isVrOnly from InputMethodInfo" into pi-dev
Tyler Gunn [Fri, 9 Mar 2018 02:33:22 +0000 (02:33 +0000)]
Merge "Support enhanced call blocking function" am:
fdcdaee2d1 am:
b70f2a1886
am:
d66b8cf06c
Change-Id: Ic89223cd31a4a8f3552360565b772315ec271902
Tyler Gunn [Fri, 9 Mar 2018 02:30:31 +0000 (02:30 +0000)]
Merge "New intent for microphone mute change notification" am:
d34cd5eb0a
am:
ffa845d141 -s ours
Change-Id: I7a71cf7b674727c03a49b75e92d5414adc1edeef
Jack He [Fri, 9 Mar 2018 02:25:38 +0000 (02:25 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name"
am:
1844f1cb43
Change-Id: I86d6304d01685c24c301c6ba440657ee58024840
TreeHugger Robot [Fri, 9 Mar 2018 02:01:24 +0000 (02:01 +0000)]
Merge "Make few of the new IMS API methods final" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 01:57:57 +0000 (01:57 +0000)]
Merge "Expose WebView#onCheckIsTextEditor" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 01:57:32 +0000 (01:57 +0000)]
Merge "Optimize incidentd memory usage" into pi-dev
yinxu [Fri, 9 Mar 2018 01:28:44 +0000 (01:28 +0000)]
Merge "Do not throw RuntimeException from stopScan()." am:
7ac5deaf38 am:
9846b53926
am:
9921cf9fe1
Change-Id: Iaae3953ac28b3a90ad920b92a8db33a6ddb66b3d
Tyler Gunn [Fri, 9 Mar 2018 01:27:39 +0000 (01:27 +0000)]
Merge "Support enhanced call blocking function" am:
fdcdaee2d1
am:
b70f2a1886
Change-Id: I70820d0d46a6c54de10b03e129a4b4df97e84a1e
Kweku Adams [Tue, 6 Mar 2018 02:06:02 +0000 (18:06 -0800)]
Documenting some core proto style conventions.
Bug:
74206433
Test: Android builds
Change-Id: I90ec796b9a06fdfd9cf1f6d69f217b636472c590
Mathieu Chartier [Fri, 9 Mar 2018 01:23:06 +0000 (01:23 +0000)]
Merge "Clean up comment"
am:
8cdc0da9ad
Change-Id: I8fde53a8d460309a2efb69a7d15e2665dd75e432
Siyamed Sinir [Fri, 9 Mar 2018 01:19:46 +0000 (17:19 -0800)]
Fix StaticLayout maxLineHeight warning
Test: atest cts/tests/tests/widget/src/android/widget/cts/TextViewTest.java
Test: atest cts/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
Test: atest frameworks/base/core/tests/coretests/src/android/text/StaticLayoutTest.java
Test: Visual inspection on apk’s provided in b/
28988744#3
Bug:
67678695
Change-Id: Ia2de14bc06022fd963b6cc677404906efbe8b70a
TreeHugger Robot [Fri, 9 Mar 2018 01:18:27 +0000 (01:18 +0000)]
Merge "Write data to file when StatsCompanionSerivice (system_server) crashes" into pi-dev
Wale Ogunwale [Fri, 9 Mar 2018 01:01:08 +0000 (17:01 -0800)]
Marked testFocusedWindowMultipleDisplays as flaky
Bug:
37908381
Test: bit me!
Change-Id: Icc2cccc3468849810df8de8778e1e9dc044b01a4
Jack He [Fri, 2 Mar 2018 21:08:36 +0000 (13:08 -0800)]
Bluetooth: Separate enable and disable Reasons from package name
* Reasons to enable or disable Bluetooth should be in a separate
namespace away from package names that initiated the enable or disable
* Delcare reason code in android/bluetooth/enums.proto as
EnableDisableReasonEnum and use these reason code together with
package names to log Bluetooth enable and disable events
* When reason is ENABLE_DISABLE_REASON_APPLICATION_REQUEST, the external
package name is the real reason why Bluetooth is enabled or disabled
* Change START_CRASH to START_ERROR since it represents a disable event
when Bluetooth failed to start
* Change UNEXPECTED_CRASH to CRASH since no crash is expected
* Add getEnableDisableReasonString() method to covert reason code to
human readable strings in dumpsys output
Bug:
74090881
Test: Toggle Bluetooth, airplane mode, BLE scanning
Change-Id: I06aa413e2a0a5f016c87759a1b694ef643c9cdee
(cherry picked from commit
0dbe66460fa2a5ebb05ca757e58141c213038bc1)
Treehugger Robot [Fri, 9 Mar 2018 00:57:53 +0000 (00:57 +0000)]
Merge "Bluetooth: Separate enable and disable Reasons from package name"
yinxu [Fri, 9 Mar 2018 00:54:47 +0000 (00:54 +0000)]
Merge "Do not throw RuntimeException from stopScan()." am:
7ac5deaf38
am:
9846b53926
Change-Id: I09c905f0a7f54e3b24b94793d14f46ad9c56cf3c
Tyler Gunn [Fri, 9 Mar 2018 00:46:56 +0000 (00:46 +0000)]
Merge "New intent for microphone mute change notification"
am:
d34cd5eb0a
Change-Id: I6435148922148d340e8a4b8bd7cf431661202d42
Wei Wang [Fri, 9 Mar 2018 00:45:18 +0000 (00:45 +0000)]
Merge "Add new 'explicit GC' policy to StrictMode." into pi-dev-plus-aosp
am:
85328af49e -s ours
Change-Id: I9786426d4fa213400dec5a5219bda9e6f1e58338
Tyler Gunn [Fri, 9 Mar 2018 00:41:31 +0000 (00:41 +0000)]
Merge "Support enhanced call blocking function"
am:
fdcdaee2d1
Change-Id: I26c38a7cca8a92011395da5e7ff758d482edbcab
Pete Gillin [Fri, 9 Mar 2018 00:38:34 +0000 (00:38 +0000)]
Add new 'explicit GC' policy to StrictMode.
am:
22316b42a9 -s ours
Change-Id: I95600d031b4aec5d5c58dbbb9953094809f7b584
Tarandeep Singh [Fri, 9 Mar 2018 00:11:37 +0000 (16:11 -0800)]
Remove debug metadata isVrOnly from InputMethodInfo
Change-Id: I1e5ae572ab0f8d53b1b8c4ae1e787aff294c82e0
Fixes:
68948291
Test: Manually built and tested. No changes expected for non-dev apps
Wei Wang [Fri, 9 Mar 2018 00:03:18 +0000 (00:03 +0000)]
Merge "Add new 'explicit GC' policy to StrictMode." into pi-dev-plus-aosp
Mathieu Chartier [Thu, 8 Mar 2018 23:38:47 +0000 (23:38 +0000)]
Merge "Clean up comment"
OSDN Git Service
