OSDN Git Service
Bryce Lee [Fri, 9 Mar 2018 16:36:24 +0000 (16:36 +0000)]
Merge "Do not call checkReadyForSleep recursively." into pi-dev
am:
e5eebd5ccd
Change-Id: I4e64f951fdfbbb2e1827849cbfbd9d14d931cca9
Amin Shaikh [Fri, 9 Mar 2018 16:31:46 +0000 (16:31 +0000)]
Merge "Move mobile signal indicator to QS footer." into pi-dev
am:
75a81749f3
Change-Id: I26498a9c31db5ad52f19d15b4d490919ef7c48c7
Michael Wright [Fri, 9 Mar 2018 16:27:12 +0000 (16:27 +0000)]
Merge "Add logging for screen timeout override." into pi-dev
am:
82022ba876
Change-Id: I890343f7cc9ff58a36752363943ee9c06081b021
Android Build Merger (Role) [Fri, 9 Mar 2018 15:21:23 +0000 (15:21 +0000)]
Merge changes from topic "am-
a59407fb236f46a7aa97883e87c6bea9" into pi-dev-plus-aosp
* changes:
Merge changes from topic "jr-viseffects" into pi-dev am:
0b4626aa23
Expand the visual effects that DND can suppress. am:
ccc6ae64ff
Julia Reynolds [Fri, 9 Mar 2018 15:18:43 +0000 (15:18 +0000)]
Merge changes from topic "jr-viseffects" into pi-dev
am:
0b4626aa23
Change-Id: I7448e6dd66c5bff50afd996b68030a53a6738842
Bryce Lee [Fri, 9 Mar 2018 15:18:27 +0000 (15:18 +0000)]
Merge "Do not call checkReadyForSleep recursively." into pi-dev
Julia Reynolds [Fri, 9 Mar 2018 15:10:14 +0000 (15:10 +0000)]
Expand the visual effects that DND can suppress.
am:
ccc6ae64ff
Change-Id: I216d9ffcbe4fe1876ba9e40063714aeae1f3add3
Android Build Merger (Role) [Fri, 9 Mar 2018 15:02:10 +0000 (15:02 +0000)]
Merge "Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev am:
21e331ed2d" into pi-dev-plus-aosp
Rubin Xu [Fri, 9 Mar 2018 15:01:37 +0000 (15:01 +0000)]
Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev
am:
21e331ed2d
Change-Id: I853102b54fa895cf53da17cf8cdc2a0bc85c89a4
Android Build Merger (Role) [Fri, 9 Mar 2018 14:58:39 +0000 (14:58 +0000)]
Merge "Merge "Check if mSurface is valid before create SurfaceSession" am:
fe118cfd10 am:
07eeea788a" into pi-dev-plus-aosp
Shibin George [Fri, 9 Mar 2018 14:58:14 +0000 (14:58 +0000)]
Merge "Check if mSurface is valid before create SurfaceSession" am:
fe118cfd10
am:
07eeea788a
Change-Id: I0eb2ab54daa623e97135a149ff34751ef83559eb
Adrian Roos [Fri, 9 Mar 2018 14:57:18 +0000 (14:57 +0000)]
Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev
am:
802bf39664
Change-Id: I2ba1dbd6dfcf031d93cb0f83740977c3ad0cb21e
TreeHugger Robot [Fri, 9 Mar 2018 14:56:59 +0000 (14:56 +0000)]
Merge "Move mobile signal indicator to QS footer." into pi-dev
Shibin George [Fri, 9 Mar 2018 14:46:25 +0000 (14:46 +0000)]
Merge "Check if mSurface is valid before create SurfaceSession"
am:
fe118cfd10
Change-Id: I774c323f87ff9dba3dd6831b8a33e2b7161162cb
dalyk [Fri, 9 Mar 2018 14:42:21 +0000 (14:42 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev
am:
e1a6d37840 -s ours
Change-Id: Id1eaffa35454dc01f792d2bfc8d9fadff0b60890
TreeHugger Robot [Fri, 9 Mar 2018 14:40:41 +0000 (14:40 +0000)]
Merge "Add logging for screen timeout override." into pi-dev
Jorim Jaggi [Fri, 9 Mar 2018 14:38:38 +0000 (14:38 +0000)]
Merge changes I46e93397,Ie0a157a9 into pi-dev
am:
3a78ec6ae4
Change-Id: Iab137d16d15e47fa63016d3f3f4702aa727d7ccd
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
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
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
Julia Reynolds [Fri, 9 Mar 2018 13:38:06 +0000 (13:38 +0000)]
Merge changes from topic "jr-viseffects" into pi-dev
* changes:
Make systemui obey new visual effect flags
Expand the visual effects that DND can suppress.
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
Treehugger Robot [Fri, 9 Mar 2018 12:58:26 +0000 (12:58 +0000)]
Merge "Check if mSurface is valid before create SurfaceSession"
Chalard Jean [Fri, 9 Mar 2018 12:57:15 +0000 (12:57 +0000)]
Merge "Deprecate most of NetworkInfo."
am:
92a9847de9
Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
TreeHugger Robot [Fri, 9 Mar 2018 12:42:55 +0000 (12:42 +0000)]
Merge "Update javadoc for WifiConfiguration.setHttpProxy" into pi-dev
Adrian Roos [Fri, 9 Mar 2018 12:40:37 +0000 (12:40 +0000)]
Merge "SysUI: Fix a bunch of hacks around insets and cutouts" into pi-dev
TreeHugger Robot [Fri, 9 Mar 2018 12:40:22 +0000 (12:40 +0000)]
Merge "Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback." into pi-dev
Jorim Jaggi [Fri, 9 Mar 2018 12:05:01 +0000 (12:05 +0000)]
Merge changes I46e93397,Ie0a157a9 into pi-dev
* changes:
Also set calling pid when registering for next activity start
Revert "Revert "Elevate remote/recents animation priority""
dalyk [Thu, 8 Mar 2018 21:33:25 +0000 (16:33 -0500)]
Add BaseNetdEventCallback class that provides no-op implementations for INetdEventCallback.
Test: None
Bug:
71828272
Merged-In: I261015d0d3e7e4159bb514742a6c588bfd34e795
Merged-In: I3a701fc52641615bf197f980022a61518c7347f4
Merged-In: I1ed5ede74ca14718e6d4f8a9a8d57de6026c9e93
Merged-In: Ib0c4b69a24144d27f672ec716fb9a8f06987ce7d
Change-Id: I75e0620f82195f18befe9dc079492a8c69bb764b
(cherry picked from commit
985d89a6e0412a3b0e8b1519de8ebffdbf708d31)
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."
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
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
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
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
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
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
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
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
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
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
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
Amin Shaikh [Thu, 8 Mar 2018 16:39:01 +0000 (11:39 -0500)]
Move mobile signal indicator to QS footer.
- Change mobile data tile to a static icon with mobile data indicators
- Add the status bar mobile network signal icon to QS footer
- Show SIM status in the carrier text in the QS footer only if the
status is not simply "No SIM card" since that status is shown in the
secondary text of the mobile data tile
Bug:
72540392
Test: visual && runtest systemui
Change-Id: I6fee19887decf68db5084edc8c0e2d23bb1938d1
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
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: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
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
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
Tyler Gunn [Fri, 9 Mar 2018 00:41:31 +0000 (00:41 +0000)]
Merge "Support enhanced call blocking function"
am:
fdcdaee2d1
Change-Id: I26c38a7cca8a92011395da5e7ff758d482edbcab
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"
Tyler Gunn [Thu, 8 Mar 2018 23:26:57 +0000 (23:26 +0000)]
Merge "New intent for microphone mute change notification"
Tyler Gunn [Thu, 8 Mar 2018 23:21:16 +0000 (23:21 +0000)]
Merge "Support enhanced call blocking function"
Vladislav Kaznacheev [Tue, 6 Mar 2018 01:11:11 +0000 (17:11 -0800)]
Display shortcut inline with item title in cascading menu
Bug:
74208750
Test: run android.widget.cts.PopupMenuTest on a large screen device
such as hikey960.
Change-Id: I1c4bca3cfecb012432e6cb89cb4cc0177ccc04f9
Leon Scroggins III [Thu, 8 Mar 2018 22:28:20 +0000 (22:28 +0000)]
Merge "ImageDecoder: Add getters. Rename setAsAlphaMask" into pi-dev
am:
2b6db8d278
Change-Id: Id750dc84a3fe3bd007afec4079aece9737f86be6
Rohan Shah [Thu, 8 Mar 2018 22:10:37 +0000 (22:10 +0000)]
Merge "[QS] Update Cellular/data usage tile" into pi-dev
am:
a24322afc6
Change-Id: I659a19a12780249b9d8fe3e7bf1355f070b7931b
Lucas Dupin [Thu, 8 Mar 2018 22:07:08 +0000 (22:07 +0000)]
Merge changes Ib8f43601,I61d82dca into pi-dev
am:
59a1bef8e9
Change-Id: I2a6f3387a8b271f5805ea6a794eeb27e190aa1c5
Jean-Michel Trivi [Fri, 22 Dec 2017 02:09:21 +0000 (18:09 -0800)]
New intent for microphone mute change notification
AudioManager: define ACTION_MICROPHONE_MUTE_CHANGED.
AudioService:
- broadcast intent when setMicrophoneMute() is called
with FLAG_RECEIVER_REGISTERED_ONLY.
- remove outdated (invalid) comments.
Bug:
70857126
Test: m -j ; make -j offline-sdk-docs ; make -j cts ; \
cts-tradefed run cts-dev -m CtsMediaTestCases -t android.media.cts.AudioManagerTest#testMicrophoneMuteIntent
Change-Id: I7391522f0195d06592e4f853e9b672fdec66d37a
Merged-In: I7391522f0195d06592e4f853e9b672fdec66d37a
Seigo Nonaka [Thu, 8 Mar 2018 22:01:24 +0000 (22:01 +0000)]
Merge "Stop using finalizer in Typeface and FontFamily" into pi-dev
am:
7d968346bf
Change-Id: I96e921a659949015d03f67eeaff1d735c78ce84b
Michael Wright [Tue, 6 Mar 2018 15:14:06 +0000 (15:14 +0000)]
Add logging for screen timeout override.
Bug:
72312560
Test: flash, see log
Change-Id: I85662b567059d3c9bc2777670cef9a8f47af7465