OSDN Git Service
Eugene Susla [Fri, 28 Apr 2017 02:29:14 +0000 (02:29 +0000)]
Merge "Follow acronym convention for Companion BLE filter" into oc-dev
am:
81d9230c88
Change-Id: I45fac28b65277448fb5a2ba59121ffeed8a12b15
TreeHugger Robot [Fri, 28 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "Follow acronym convention for Companion BLE filter" into oc-dev
Erik Kline [Fri, 28 Apr 2017 02:15:51 +0000 (02:15 +0000)]
Merge "WifiManager: add updateInterfaceIpState" into oc-dev
am:
95581dacb2 -s ours
Change-Id: Ia0f26ea98d0cd20a01e997a608c5794934207c50
Rebecca Silberstein [Fri, 28 Apr 2017 02:07:12 +0000 (02:07 +0000)]
WifiManager: add updateInterfaceIpState
am:
720cac4536 -s ours
Change-Id: I683a67b6cac37e68e2a09e56d64ca6db5adec707
Erik Kline [Fri, 28 Apr 2017 01:56:57 +0000 (01:56 +0000)]
Merge "WifiManager: add updateInterfaceIpState" into oc-dev
Felipe Leme [Fri, 28 Apr 2017 01:54:04 +0000 (01:54 +0000)]
Merge "Fixed requestAutofill()." into oc-dev
am:
17238a3f1a
Change-Id: Ibcf4075a3f12c82bbd968d2e2fb63a3dd8ea5bbc
Philip P. Moltmann [Fri, 28 Apr 2017 01:45:46 +0000 (01:45 +0000)]
Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev
am:
81c591b77e
Change-Id: I1fd6c13921b9563aab42fa054c3ade403bc52f1a
Selim Gurun [Fri, 28 Apr 2017 01:41:40 +0000 (01:41 +0000)]
Merge "Hide onMovedToDisplay for WebView" into oc-dev
am:
a7045f59e0
Change-Id: I1f8bba3810c1945c38c33b38ace0a327b6c404f4
Philip P. Moltmann [Fri, 28 Apr 2017 01:39:27 +0000 (01:39 +0000)]
Merge "Do not autofill twice" into oc-dev
am:
a896d6abf4
Change-Id: I3a17ae8e3d4c547bcd2cf7a4302870b028c6328f
TreeHugger Robot [Fri, 28 Apr 2017 01:36:04 +0000 (01:36 +0000)]
Merge "Fixed requestAutofill()." into oc-dev
Winson Chung [Fri, 28 Apr 2017 01:31:58 +0000 (01:31 +0000)]
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev
am:
a2f102b175
Change-Id: Iefe4e55a2a048e66ae60c198b3fa4550ff423515
Chad Brubaker [Fri, 28 Apr 2017 01:29:57 +0000 (01:29 +0000)]
Merge "Expose missing accessibility settings to instant apps" into oc-dev
am:
4108aa77e8
Change-Id: I8bd5c9ee05c805129dd5d6b2eea1fac48ba923db
Mathias Agopian [Fri, 28 Apr 2017 01:25:27 +0000 (01:25 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
am:
b9a2e32130
Change-Id: I3ea8572dd89f5cc71dd74dd7b21e559b30d5cc4d
TreeHugger Robot [Fri, 28 Apr 2017 01:21:48 +0000 (01:21 +0000)]
Merge "Fix LoginActivityTest#testIsServiceEnabled" into oc-dev
Selim Gurun [Fri, 28 Apr 2017 01:20:25 +0000 (01:20 +0000)]
Merge "Hide onMovedToDisplay for WebView" into oc-dev
Selim Cinek [Fri, 28 Apr 2017 01:20:22 +0000 (01:20 +0000)]
Merge changes from topic 'music_extraction' into oc-dev
am:
e44061f9e7
Change-Id: I8c5a58540be4e96aea4c48a8365f512d508ff1c5
TreeHugger Robot [Fri, 28 Apr 2017 01:19:40 +0000 (01:19 +0000)]
Merge "Do not autofill twice" into oc-dev
Jakub Pawlowski [Fri, 28 Apr 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Bluetooth: Add constants to ScanResult" into oc-dev
am:
fc61f37341
Change-Id: I9e9d002b8d6b4b6b1884278f48ff5255d2615860
Phil Weaver [Fri, 28 Apr 2017 01:12:01 +0000 (01:12 +0000)]
Merge "Remove reference to removed string" into oc-dev
am:
9a5dfd393b
Change-Id: Ie519286bc2d3319222f29f41de0057c56aa56ebd
Erik Wolsheimer [Fri, 28 Apr 2017 01:10:00 +0000 (01:10 +0000)]
Merge "Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e" into oc-dev
am:
1702c33ceb
Change-Id: Ic91af9a7c17bf1128f6b2f5c8c8e057255d460f7
Todd Kennedy [Fri, 28 Apr 2017 01:07:34 +0000 (01:07 +0000)]
Merge "add 'changes' cmd to dumpsys" into oc-dev
am:
38b58abaac
Change-Id: Ie3746f8f06a74c6a5954113032ad6d0e9e4cd4e8
Adam Lesinski [Fri, 28 Apr 2017 01:04:51 +0000 (01:04 +0000)]
Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
am:
e7172ff9fb
Change-Id: I7b8e53f8394e41433ceebe4f6e477f8561e49807
Wei Wang [Fri, 28 Apr 2017 01:01:55 +0000 (01:01 +0000)]
Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev
am:
afd8d9e2b2
Change-Id: I92ca90c34a9fadeabf324a84ec41772dcdebc57f
Winson Chung [Fri, 28 Apr 2017 00:58:18 +0000 (00:58 +0000)]
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev
Seigo Nonaka [Fri, 28 Apr 2017 00:50:39 +0000 (00:50 +0000)]
Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev
am:
2b6bf2f221
Change-Id: I8da2c3c357be33e07733072a5e638a103014190b
Joe Onorato [Fri, 28 Apr 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
am:
f516251453
Change-Id: I9ec51f68442b2352f98238e70641b041dd94725b
Suprabh Shukla [Fri, 28 Apr 2017 00:41:55 +0000 (00:41 +0000)]
Merge "Fixing service notification on secondary users" into oc-dev
am:
c1aaede528
Change-Id: I74d90a707ab3cb7ced185995caed9fa6c0a17f28
TreeHugger Robot [Fri, 28 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "Expose missing accessibility settings to instant apps" into oc-dev
Julia Reynolds [Fri, 28 Apr 2017 00:39:35 +0000 (00:39 +0000)]
Merge "Change snoozing behavior for notifications in groups" into oc-dev
am:
ad9412cf8a
Change-Id: I548d7e648de5ea8ec8234418d1c06f47f4e40697
Winson Chung [Fri, 28 Apr 2017 00:38:13 +0000 (17:38 -0700)]
Only sublist array by size or limit, whichever is smaller.
Bug:
37756537
Test: Set < 3 actions, ensure no crash...
Change-Id: I93a5ac78292fcdd870ebd897441c2cef0774d134
Jakub Pawlowski [Fri, 28 Apr 2017 00:36:03 +0000 (00:36 +0000)]
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
am:
9a4b756c9b
Change-Id: I3b18c86a3981db316369a11d91a9334a38205151
Mathias Agopian [Fri, 28 Apr 2017 00:29:28 +0000 (00:29 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
Selim Cinek [Fri, 28 Apr 2017 00:24:49 +0000 (00:24 +0000)]
Merge changes from topic 'music_extraction' into oc-dev
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
Mathias Agopian [Thu, 20 Apr 2017 23:36:15 +0000 (16:36 -0700)]
Plumb gralloc producer/consumer bits correctly
Bug:
33350696
Test: compile, boot device, its
Change-Id: I6129cedce0b35acfef1702afdd178ba043dd53cb
TreeHugger Robot [Fri, 28 Apr 2017 00:04:07 +0000 (00:04 +0000)]
Merge "Bluetooth: Add constants to ScanResult" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 23:57:38 +0000 (23:57 +0000)]
Merge "Remove reference to removed string" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:53:52 +0000 (23:53 +0000)]
Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e
am:
d34305c2af
Change-Id: Ib7c815cd0bc06f31eace7dd4147feb17d9c1a57a
Android Build Merger (Role) [Thu, 27 Apr 2017 23:52:53 +0000 (23:52 +0000)]
Merge "Add logging around dream start/stop am:
4769b54d49 am:
b50a0cdd5e" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:51:45 +0000 (23:51 +0000)]
Add logging around dream start/stop am:
4769b54d49
am:
b50a0cdd5e
Change-Id: I0db4f7ff4c7782e71ff7a4e7528776462132d3ed
TreeHugger Robot [Thu, 27 Apr 2017 23:51:28 +0000 (23:51 +0000)]
Merge "add 'changes' cmd to dumpsys" into oc-dev
Erik Wolsheimer [Thu, 27 Apr 2017 23:48:51 +0000 (23:48 +0000)]
Add logging around dream start/stop am:
4769b54d49
am:
b50a0cdd5e
Change-Id: I8b658faa9eac7c448c0e37cc81d93775ecb4c8d7
TreeHugger Robot [Thu, 27 Apr 2017 23:45:38 +0000 (23:45 +0000)]
Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev
Adam Powell [Thu, 27 Apr 2017 23:45:22 +0000 (23:45 +0000)]
Merge "Address API feedback for new fragment APIs" into oc-dev
am:
13d03e504d
Change-Id: Ia68a03aff0ad012a80ff23f60708856dbe795b16
Erik Wolsheimer [Thu, 27 Apr 2017 23:43:19 +0000 (23:43 +0000)]
Add logging around dream start/stop
am:
4769b54d49
Change-Id: If77de68a0c775b32b6df7e95462f698efc2f84ee
Derek Sollenberger [Thu, 27 Apr 2017 23:41:25 +0000 (23:41 +0000)]
Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev
am:
f9dc09f4ea
Change-Id: I613b0f380995d88bbda6c916af68b96ab69e8dff
Sujith Ramakrishnan [Thu, 27 Apr 2017 23:39:25 +0000 (23:39 +0000)]
Merge "Updated intent action name to comply with CTS." into oc-dev
am:
b4f21f0482
Change-Id: Ica8d3565560993dc100ccfb20adf8028f807d44f
TreeHugger Robot [Thu, 27 Apr 2017 23:38:22 +0000 (23:38 +0000)]
Merge "Throttle wifi scan requests from background apps (1/2)." into oc-dev
Chris Tate [Thu, 27 Apr 2017 23:37:23 +0000 (23:37 +0000)]
Merge "Fix 'jobscheduler run' shell command" into oc-dev
am:
cfdc7eb87c
Change-Id: Ida9bc04031e043311fa8c5bd6b3bbb75eb64106c
Lucas Dupin [Thu, 27 Apr 2017 23:35:01 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev
am:
a851b5ae76
Change-Id: I6ccf0d0c1cefa9e16b68071bb7d98586fc54d9ad
fionaxu [Thu, 27 Apr 2017 23:29:44 +0000 (23:29 +0000)]
Merge "new reset carrier signals/actions" into oc-dev
am:
b71f3ca3f0
Change-Id: Icb549f9a80e761b00a129f9fcab8934130fd0417
Evan Rosky [Thu, 27 Apr 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Only restrict arrows out of text fields from keyboard" into oc-dev
am:
d0c6cf9bc0
Change-Id: Ia470d8ece930a53a54976620b2fe6711a107e652
Dmitry Dementyev [Thu, 27 Apr 2017 23:25:28 +0000 (23:25 +0000)]
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
am:
e669ae438f
Change-Id: I41c726829585b3628125b17548428b3cc4f3a06e
TreeHugger Robot [Thu, 27 Apr 2017 23:17:06 +0000 (23:17 +0000)]
Merge "Remove FontsContract.buildTypeface with weight/italic argument." into oc-dev
Joe Onorato [Thu, 27 Apr 2017 23:15:09 +0000 (23:15 +0000)]
Merge "Turn off log spew, and make it use Slog.w instead of e.printStackTrace" into oc-dev
Android Build Merger (Role) [Thu, 27 Apr 2017 23:13:27 +0000 (23:13 +0000)]
Merge "Merge "new reset carrier signals/actions" am:
5bd39aaf42 am:
dc31a45517 am:
89b525afb3" into oc-dev-plus-aosp
fionaxu [Thu, 27 Apr 2017 23:12:12 +0000 (23:12 +0000)]
Merge "new reset carrier signals/actions" am:
5bd39aaf42 am:
dc31a45517
am:
89b525afb3
Change-Id: Idcdfb7667b0db7b403bab38bcc24201a8eafe4ca
Jorim Jaggi [Thu, 27 Apr 2017 23:09:09 +0000 (23:09 +0000)]
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
am:
560324cfa0
Change-Id: I268c6e571d18aea91de4d6e7b29e0fa23f0c1885
TreeHugger Robot [Thu, 27 Apr 2017 23:02:31 +0000 (23:02 +0000)]
Merge "Fixing service notification on secondary users" into oc-dev
fionaxu [Thu, 27 Apr 2017 23:02:23 +0000 (23:02 +0000)]
Merge "new reset carrier signals/actions" am:
5bd39aaf42
am:
dc31a45517
Change-Id: I59b456a4e849900080cc0564b096e6dacf7070ae
Sudheer Shanka [Thu, 27 Apr 2017 23:01:09 +0000 (23:01 +0000)]
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
am:
7e7f7d526d
Change-Id: I58ef3598a912d72ba0a67311b8c5b11c30287f5b
fionaxu [Thu, 27 Apr 2017 22:57:30 +0000 (22:57 +0000)]
Merge "new reset carrier signals/actions"
am:
5bd39aaf42
Change-Id: I503cd2c7d7ca63d9668995319d4876a39fc91666
TreeHugger Robot [Thu, 27 Apr 2017 22:56:03 +0000 (22:56 +0000)]
Merge "Change snoozing behavior for notifications in groups" into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 22:55:06 +0000 (22:55 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master am:
c6c9508f8a
am:
90e8cc8f26
Change-Id: I7bda67787c3d874f7016ae3aa7e4563a03f38c0c
Jakub Pawlowski [Thu, 27 Apr 2017 22:52:34 +0000 (22:52 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c am:
b6656f07e7
am:
493ae0da60
Change-Id: Ib7c7f3f71e6e49d06091effb99ac09dae605822e
Android Build Merger (Role) [Thu, 27 Apr 2017 22:50:57 +0000 (22:50 +0000)]
Merge "Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev am:
d08c064976" into oc-dev-plus-aosp
Treehugger Robot [Thu, 27 Apr 2017 22:48:07 +0000 (22:48 +0000)]
Merge "new reset carrier signals/actions"
Bryce Lee [Thu, 27 Apr 2017 22:46:52 +0000 (22:46 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
am:
d08c064976
Change-Id: I16b6bd1905880f96b6a2d47915556b9775a3689a
Jakub Pawlowski [Thu, 27 Apr 2017 22:42:18 +0000 (22:42 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master
am:
c6c9508f8a
Change-Id: I8876af2e00e6a52629a47c1ef7c26f4c674e5de8
Android Build Merger (Role) [Thu, 27 Apr 2017 22:38:39 +0000 (22:38 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master
Jakub Pawlowski [Thu, 27 Apr 2017 22:35:15 +0000 (22:35 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
am:
369a94496c
Change-Id: I6fbd113aa163a0941e95b6517f3819d1d68a3342
Jakub Pawlowski [Thu, 27 Apr 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c
am:
b6656f07e7
Change-Id: I29f06e5c612e29ae25bde0e3e8854bf88213b65d
Chad Brubaker [Thu, 27 Apr 2017 22:28:57 +0000 (15:28 -0700)]
Expose missing accessibility settings to instant apps
Fixes:
37631050
Test: EphemeralTest#testWebViewLoads
Change-Id: I9c4c6d5dd4b8f2c1e27009d77f6f11035d4f1667
Selim Cinek [Tue, 25 Apr 2017 05:18:48 +0000 (22:18 -0700)]
Make music notifications not dimmable
For contrast requirements and for the image effect
to work properly, music notifications should not be
dimmable.
Test: add music notification, look at lockscreen
Fixes:
36561228
Merged-In: I58313e1828c64d34737390ad03e1deef078a7059
Change-Id: I58313e1828c64d34737390ad03e1deef078a7059
Bryce Lee [Thu, 27 Apr 2017 22:27:50 +0000 (22:27 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
am:
d08c064976
Change-Id: I5b636585e52c25280c4f30fe9da33510bcf0f52d
Jakub Pawlowski [Thu, 27 Apr 2017 22:26:27 +0000 (22:26 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
am:
369a94496c
Change-Id: I9de3466936fd66afd973aa84003202c96aebec32
Sudheer Shanka [Thu, 27 Apr 2017 22:25:14 +0000 (22:25 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
am:
8dd177c4e8
Change-Id: Ibf0daf62f79608cf6616226762d959f0aac20d3b
Jakub Pawlowski [Thu, 27 Apr 2017 15:37:04 +0000 (08:37 -0700)]
Bluetooth: Add constants to ScanResult
Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT
Test: none
Bug:
37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad
(cherry-picked from commit
c7c01a28774e431a408744b443a674f2622fde9f)
Selim Cinek [Tue, 25 Apr 2017 02:48:29 +0000 (19:48 -0700)]
Implementing gradual image fade for the media template
Test: play music
Merged-In: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes:
36561228
Selim Cinek [Thu, 20 Apr 2017 23:55:38 +0000 (16:55 -0700)]
Extracting the notification colors based on the album art
Media notifications are now extracting the background and
foreground colors from the album art.
Test: manual, play different songs
Bug:
36561228
Merged-In: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Jakub Pawlowski [Thu, 27 Apr 2017 22:20:37 +0000 (22:20 +0000)]
Merge changes from topic 'bt5-cherry-pickerry-3' into oc-dev
* changes:
Fix NPE when accessing mCallback in BluetoothGatt
Expose LE advertiser address for easier PTS tests (1/6)
Read by UUID for PTS tests (1/5)
TreeHugger Robot [Thu, 27 Apr 2017 22:18:00 +0000 (22:18 +0000)]
Merge "Address API feedback for new fragment APIs" into oc-dev
Tima Vaisburd [Thu, 27 Apr 2017 22:17:54 +0000 (22:17 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
am:
9c14b91aa9
Change-Id: Ifaa89f3fd18fff60e8d702b2352e39b9e3dba744
Jakub Pawlowski [Thu, 27 Apr 2017 22:12:57 +0000 (22:12 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
TreeHugger Robot [Thu, 27 Apr 2017 22:10:44 +0000 (22:10 +0000)]
Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev
Sujith Ramakrishnan [Thu, 27 Apr 2017 22:10:05 +0000 (22:10 +0000)]
Merge "Updated intent action name to comply with CTS." into oc-dev
Chris Tate [Thu, 27 Apr 2017 22:03:53 +0000 (22:03 +0000)]
Merge "Fix 'jobscheduler run' shell command" into oc-dev
Todd Kennedy [Thu, 27 Apr 2017 21:58:42 +0000 (14:58 -0700)]
add 'changes' cmd to dumpsys
Bug:
37714054
Test: Manual; adb shell dumpsys package changes
Change-Id: Ibab209f80da7ac588bae54c3226305a95306cd7c
TreeHugger Robot [Thu, 27 Apr 2017 21:44:50 +0000 (21:44 +0000)]
Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev
Phil Weaver [Thu, 27 Apr 2017 21:42:47 +0000 (14:42 -0700)]
Remove reference to removed string
Bug:
37750336
Test: make
Change-Id: I982f9e9a4d40abaf3f990d85d7c02c79f3147a38
TreeHugger Robot [Thu, 27 Apr 2017 21:35:42 +0000 (21:35 +0000)]
Merge "new reset carrier signals/actions" into oc-dev
Selim Cinek [Thu, 20 Apr 2017 22:16:10 +0000 (15:16 -0700)]
Moved notification builder creation to the background
In preparation of future colorization work, the creation
of the notification builder is moved to the background.
Test: manual, add notifications, update them etc.
Test: runtest systemui
Bug:
36561228
Merged-In: Iaec5febf4d8d9da348d77e0d4f6f61b9746fae16
Change-Id: Iaec5febf4d8d9da348d77e0d4f6f61b9746fae16
Erik Wolsheimer [Thu, 27 Apr 2017 21:32:46 +0000 (14:32 -0700)]
Add logging around dream start/stop
Bug:
28455483
Change-Id: I31d4d52c3ed4cbfc6f6a9d978fd2669224ba95b4
Evan Rosky [Thu, 27 Apr 2017 21:28:08 +0000 (21:28 +0000)]
Merge "Only restrict arrows out of text fields from keyboard" into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 21:24:35 +0000 (21:24 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb am:
28f182aa87
am:
3657c398e1
Change-Id: I9425efce8de6376c0e3c74401d74da39e8037b98
Tima Vaisburd [Thu, 27 Apr 2017 17:53:27 +0000 (10:53 -0700)]
Hide onMovedToDisplay for WebView
Bug:
37724053
Test: Not needed
Change-Id: Ic6decc3be65e6b16f8fb42149f3e0798e855d4b7
TreeHugger Robot [Thu, 27 Apr 2017 21:23:35 +0000 (21:23 +0000)]
Merge "Use invalid package names for special keys in AccountManager." into oc-dev
Jeff Davidson [Thu, 27 Apr 2017 21:22:23 +0000 (21:22 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de am:
0b79745dd1
am:
f026342263 -s ours
Change-Id: I991af9483fa932479f5a1af5809596ce067a69a8
Chen Xu [Thu, 27 Apr 2017 21:17:09 +0000 (21:17 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd am:
2eae7bfc03
am:
36b80785a6 -s ours
Change-Id: I4915bc05c136f87ed79d8f77f101c0b439a01488
Seigo Nonaka [Thu, 27 Apr 2017 21:15:52 +0000 (14:15 -0700)]
Remove FontsContract.buildTypeface with weight/italic argument.
Passing weight/italic to the family does not make sense.
Bug:
37750436
Test: N/A
Change-Id: I43a624179338c1f98aad36cfd08daa152e83944c
Pankaj Kanwar [Thu, 27 Apr 2017 21:14:07 +0000 (21:14 +0000)]
Merge "resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp" into oc-dev-plus-aosp
OSDN Git Service
