OSDN Git Service
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 27 Apr 2017 21:35:42 +0000 (21:35 +0000)]
Merge "new reset carrier signals/actions" into oc-dev
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
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
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
fionaxu [Wed, 26 Apr 2017 23:05:25 +0000 (16:05 -0700)]
new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.
Bug:
34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Merged-in: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
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
Jorim Jaggi [Thu, 27 Apr 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
Sudheer Shanka [Thu, 27 Apr 2017 20:47:04 +0000 (20:47 +0000)]
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
Bryce Lee [Thu, 27 Apr 2017 20:41:32 +0000 (20:41 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
Amith Yamasani [Thu, 27 Apr 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
am:
3a4987bbe7
Change-Id: If3007f9a939cb17be63fe148d68178c9fabfea48
Adrian Roos [Thu, 27 Apr 2017 20:33:47 +0000 (20:33 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
am:
898b0cb39a
Change-Id: Ifdc2b56ce9b59ea9c3f185fb6fac8850842bbb67
Sudheer Shanka [Thu, 27 Apr 2017 20:31:04 +0000 (20:31 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
Sujith Ramakrishnan [Mon, 24 Apr 2017 22:57:58 +0000 (15:57 -0700)]
Updated intent action name to comply with CTS.
- Updated "android.intent.action.GLOBAL_BUTTON" to
@SystemApi
Test: manual - Bottom button on Fugu brings up pairing screen
Test: manual - GUIDE button on Fugu brings up TV channels app
Bug:
37499047
Change-Id: I3b92ed99aeb53674fbaac91126e8c5e7fcffa715
Makoto Onuki [Thu, 27 Apr 2017 20:25:57 +0000 (20:25 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
am:
301663a61b
Change-Id: I93d38d5255975a211723b41eacaec5ab882a7621
Tima Vaisburd [Thu, 27 Apr 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:21:44 +0000 (20:21 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
Pavel Grafov [Thu, 27 Apr 2017 20:12:22 +0000 (20:12 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
am:
54e534d6e7
Change-Id: I27f51d0183f0e28e2d17f41c69f35aee6a6785a7
TreeHugger Robot [Thu, 27 Apr 2017 20:10:49 +0000 (20:10 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:03:16 +0000 (20:03 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 19:56:09 +0000 (19:56 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb
am:
28f182aa87
Change-Id: I85f4847b7c530bded24dcb27faa851ed9b5ba653
TreeHugger Robot [Thu, 27 Apr 2017 19:53:48 +0000 (19:53 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
Jakub Pawlowski [Thu, 27 Apr 2017 19:46:06 +0000 (19:46 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
am:
1be8fb23eb
Change-Id: I764b7a169e5acabef07fafc43367040d8d493d7b
Chad Brubaker [Thu, 27 Apr 2017 19:41:06 +0000 (19:41 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
am:
a9d0e6b205
Change-Id: I6edd3a615c1c276b6d7842af471dc928281f1f6f
Treehugger Robot [Thu, 27 Apr 2017 19:37:53 +0000 (19:37 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
Jakub Pawlowski [Thu, 27 Apr 2017 14:04:15 +0000 (07:04 -0700)]
Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e48159fd37f827d30b822f2f187551e.
Bug:
37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
Adam Powell [Tue, 25 Apr 2017 22:24:49 +0000 (15:24 -0700)]
Address API feedback for new fragment APIs
Framework edition
Bug:
37637473
Bug:
37636731
Bug:
37638276
Test: run fragment tests
Change-Id: I3e77ab51d60f5a550d60701fc81a84e143a53244
pkanwar [Thu, 27 Apr 2017 19:31:39 +0000 (12:31 -0700)]
resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp
Test: manual
BUG:
35606429
Change-Id: I0e9c5edaaa3e0ddf7719ebbffd650b8bdd88faa1
Chad Brubaker [Thu, 27 Apr 2017 19:30:50 +0000 (19:30 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
Michal Karpinski [Thu, 27 Apr 2017 19:16:09 +0000 (19:16 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
am:
38439169bd
Change-Id: I3220ae4b0c2da8438ffd034649dd8fc950b20b36
Dmitry Dementyev [Wed, 26 Apr 2017 00:02:47 +0000 (17:02 -0700)]
Use invalid package names for special keys in AccountManager.
Bug:
37672088
Test: cts, manual.
Change-Id: I7fd40e0646a50f809b5c9b89dfe4242ceb00195d
Christopher Tate [Thu, 27 Apr 2017 18:22:15 +0000 (11:22 -0700)]
Fix 'jobscheduler run' shell command
Tidying up the locking + deferred-work shape of the job scheduler's
internal flow inadvertently meant that we were now trying to bind to
a job service while under the shell user's uid when the relevant
shell command was used to kick off the job. Now we don't do that.
Bug
37744607
Test: manual
Change-Id: Ia4b83f83f9fbd2e5678eaa279f1d86206fb05023
TreeHugger Robot [Thu, 27 Apr 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:32:00 +0000 (18:32 +0000)]
Merge "Report correct display id in stack info" into oc-dev
am:
0dca566677
Change-Id: Ieebfe01fb98d066be46aea23ca0206d17dd92b67
Jeff Davidson [Thu, 27 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de
am:
0b79745dd1
Change-Id: Id9d1f415a386238e6357f5952f78e395ee034bd2
Android Build Merger (Role) [Thu, 27 Apr 2017 18:23:19 +0000 (18:23 +0000)]
Merge "Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064 am:
c1da2a0341 -s ours" into oc-dev-plus-aosp
Ajay Panicker [Thu, 27 Apr 2017 18:20:40 +0000 (18:20 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064
am:
c1da2a0341 -s ours
Change-Id: I91b79208a1afea91ab83bfe9b687710945f66742
Andrii Kulian [Thu, 27 Apr 2017 18:19:32 +0000 (18:19 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
am:
bfe5aa23e8
Change-Id: I457340e86ffcfb9256960c554d8041a208d7cdad
Andrii Kulian [Thu, 27 Apr 2017 18:18:29 +0000 (18:18 +0000)]
Merge "Report correct display id in stack info" into oc-dev
Jeff Davidson [Thu, 27 Apr 2017 18:17:28 +0000 (18:17 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
am:
4898b704de
Change-Id: Ic11d6568aac8cdad151c61fa32d4535ccea9f53b
Andrii Kulian [Thu, 27 Apr 2017 18:09:13 +0000 (18:09 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
fionaxu [Wed, 26 Apr 2017 23:05:25 +0000 (16:05 -0700)]
new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.
Bug:
34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Chen Xu [Thu, 27 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd
am:
2eae7bfc03
Change-Id: I86cec4ba1f4cbc86fa84dc9d036542bebcc93100
Jeff Davidson [Thu, 27 Apr 2017 18:03:31 +0000 (18:03 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
Pankaj Kanwar [Thu, 27 Apr 2017 17:58:16 +0000 (17:58 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key." am:
0c83ef2c72
am:
1dec74b78f
Change-Id: I6b15e49763d8e0cfa23238834a8056288de77176
Chen Xu [Thu, 27 Apr 2017 17:57:36 +0000 (17:57 +0000)]
Merge "Add getVisualVoicemailPackageName()"
am:
998eb212bd
Change-Id: I482cd62e9f2330624e688b8d65aa9353500b1d79
Pavel Grafov [Thu, 27 Apr 2017 13:22:26 +0000 (14:22 +0100)]
Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.
Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.
Bug:
37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
Pankaj Kanwar [Thu, 27 Apr 2017 17:49:09 +0000 (17:49 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
am:
0c83ef2c72
Change-Id: I8a326ac926e880d8095330638e54d56ad8c98485
Ajay Panicker [Thu, 27 Apr 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1
am:
e429211064
Change-Id: I9ce4924aba66c45425789dd16e477dfa99e6b74a
Chen Xu [Thu, 27 Apr 2017 17:46:02 +0000 (17:46 +0000)]
Merge "Add getVisualVoicemailPackageName()"
Android Build Merger (Role) [Thu, 27 Apr 2017 17:43:20 +0000 (17:43 +0000)]
Merge "Merge "Revise method comment on setFontVariationSettings" into oc-dev am:
e6746726bc" into oc-dev-plus-aosp
Seigo Nonaka [Thu, 27 Apr 2017 17:42:40 +0000 (17:42 +0000)]
Merge "Revise method comment on setFontVariationSettings" into oc-dev
am:
e6746726bc
Change-Id: Id0cd07f81ca333c4d71aba902d6108c267938328
Android Build Merger (Role) [Thu, 27 Apr 2017 17:42:04 +0000 (17:42 +0000)]
Merge "Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a am:
6986e8a1ba" into oc-dev-plus-aosp
Pankaj Kanwar [Thu, 27 Apr 2017 17:41:56 +0000 (17:41 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
David Farrow [Thu, 27 Apr 2017 17:41:21 +0000 (17:41 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a
am:
6986e8a1ba
Change-Id: I74141f17f116f4be59f8925868894c805ee1fec2
Android Build Merger (Role) [Thu, 27 Apr 2017 17:40:52 +0000 (17:40 +0000)]
Merge "Merge "Reduce scrypt time in synthetic password flow" into oc-dev am:
71e0fcbf2f" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 27 Apr 2017 17:40:23 +0000 (17:40 +0000)]
Merge "Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a am:
393f0c185a" into oc-dev-plus-aosp
Rubin Xu [Thu, 27 Apr 2017 17:40:02 +0000 (17:40 +0000)]
Merge "Reduce scrypt time in synthetic password flow" into oc-dev
am:
71e0fcbf2f
Change-Id: If8b4d7845160bc0887f5b3b535135849d00b6d01
Ajay Panicker [Thu, 27 Apr 2017 17:39:14 +0000 (17:39 +0000)]
Merge "Limit btsnoop file size (3/8)"
am:
37cad12cb1
Change-Id: I75129661ddb46e9975c7752ffb40e64d4430660b
David Farrow [Thu, 27 Apr 2017 17:38:28 +0000 (17:38 +0000)]
Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a
am:
393f0c185a
Change-Id: Ic297a3643a0f01d6d8315b973c2e0863d193446a
Doris Liu [Thu, 27 Apr 2017 17:37:56 +0000 (17:37 +0000)]
Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev
am:
f4063d4201
Change-Id: Ia793fb18c70744db2c384ea6691635f1abc4179d
OSDN Git Service
