OSDN Git Service
Colin Cross [Thu, 15 Mar 2018 06:57:33 +0000 (06:57 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]"" am:
79fe334055
am:
5c97779e01
Change-Id: I2eb53c6d8a310a54c06df82bb2dd30ea5e77f01b
Colin Cross [Thu, 15 Mar 2018 06:47:37 +0000 (06:47 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""
am:
79fe334055
Change-Id: If3575ef82b34e5685b5fed36f7cb0a7e2e6e0d93
Seigo Nonaka [Thu, 15 Mar 2018 06:34:26 +0000 (06:34 +0000)]
Merge "Remove mtOffset from drawTextRun" into pi-dev
am:
bc20993e4b
Change-Id: Idf2f87cc3543d32273b82f99eb4b7c2e9ab03767
TreeHugger Robot [Thu, 15 Mar 2018 06:20:41 +0000 (06:20 +0000)]
Merge "Remove mtOffset from drawTextRun" into pi-dev
Colin Cross [Thu, 15 Mar 2018 05:25:39 +0000 (05:25 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""
Colin Cross [Thu, 15 Mar 2018 05:24:49 +0000 (05:24 +0000)]
Revert "Add RequestShortAudioDescriptorAction. [1/2]"
This reverts commit
9e16580f78a6621c8957f427b6d9b8fadc813afd.
Reason for revert: Broke all the builds.
Change-Id: If2b8a0a36d6e2a902c33a66b82b11f693d7f7139
Andrew Sapperstein [Thu, 15 Mar 2018 05:21:38 +0000 (05:21 +0000)]
Merge "Add sysWhitelistedAppsExceptIdle in whitelist" into pi-dev
am:
2572f6b7ae
Change-Id: Id09c076d22aade83058d0f1baf6822a3bca156c0
Andrew Sapperstein [Thu, 15 Mar 2018 05:09:59 +0000 (05:09 +0000)]
Merge "Add sysWhitelistedAppsExceptIdle in whitelist" into pi-dev
sqian [Thu, 15 Mar 2018 04:55:20 +0000 (04:55 +0000)]
Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev
am:
a97d430aad
Change-Id: I1dac4e925743f016f4fbb11919b4f326082a4db3
TreeHugger Robot [Thu, 15 Mar 2018 04:37:28 +0000 (04:37 +0000)]
Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev
Chris Wren [Thu, 15 Mar 2018 04:30:11 +0000 (04:30 +0000)]
Merge changes from topic "latency" into pi-dev
am:
02fea57dc0
Change-Id: I3297c5792940f315fad558a0a9fcb6d857f278ae
Adora Zhang [Thu, 15 Mar 2018 04:11:28 +0000 (04:11 +0000)]
Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev
am:
5d9617c439
Change-Id: I9e58a2f71559cbf73b693f1fe808783157fc2f0a
Seigo Nonaka [Thu, 15 Mar 2018 00:08:28 +0000 (17:08 -0700)]
Remove mtOffset from drawTextRun
Bug:
72998298
Test: atest CtsWidgetTestCases:EditTextTest
CtsWidgetTestCases:TextViewFadingEdgeTest
FrameworksCoreTests:TextViewFallbackLineSpacingTest
FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
CtsTextTestCases FrameworksCoreTests:android.text
CtsWidgetTestCases:TextViewPrecomputedTextTest
Change-Id: Ia886c1ce9f7387559d7fe00b34ce03378d56ecec
Android Build Merger (Role) [Thu, 15 Mar 2018 04:00:12 +0000 (04:00 +0000)]
Merge "Merge "Fix cleartext default for the manifest value" into pi-dev am:
75a3173245" into pi-dev-plus-aosp
Chad Brubaker [Thu, 15 Mar 2018 03:58:54 +0000 (03:58 +0000)]
Merge "Fix cleartext default for the manifest value" into pi-dev
am:
75a3173245
Change-Id: Ia4a493ffb62847f5373ab4dc4e927ff61ba3cf90
Android Build Merger (Role) [Thu, 15 Mar 2018 03:53:10 +0000 (03:53 +0000)]
Merge "Merge "Update text alignment when using drawTextOnPath." into pi-dev am:
77e74b64eb" into pi-dev-plus-aosp
Derek Sollenberger [Thu, 15 Mar 2018 03:52:37 +0000 (03:52 +0000)]
Merge "Update text alignment when using drawTextOnPath." into pi-dev
am:
77e74b64eb
Change-Id: I5c2cf668a9c0040aeb1964c3988aeba08cdbde63
Dan Zhang [Thu, 15 Mar 2018 03:48:36 +0000 (03:48 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]" am:
c27ebbaa8f
am:
80be69179f
Change-Id: I9cf487aff32c2942447348c2c954c0d446a9b582
Julia Reynolds [Thu, 15 Mar 2018 03:40:43 +0000 (03:40 +0000)]
Merge "Add msg to shade when dnd is suppressing notis" into pi-dev
am:
4e93901774
Change-Id: Ie82e78a1b6a815bba9ef810592faed4c6eea00f7
TreeHugger Robot [Thu, 15 Mar 2018 03:37:00 +0000 (03:37 +0000)]
Merge changes from topic "latency" into pi-dev
* changes:
use the dedicated latency field in logmaker
add reserved latency field
Dan Zhang [Thu, 15 Mar 2018 03:35:12 +0000 (03:35 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]"
am:
c27ebbaa8f
Change-Id: Iffeeccf9056131edb8921a1597b3b34b320cd747
Tracy Zhou [Thu, 15 Mar 2018 03:25:22 +0000 (03:25 +0000)]
Merge "Fix PIP settings icons shows in unexpanded state." into pi-dev
am:
95d4b5b582
Change-Id: Iad784b5189fe9ba252218f092d7a943d3e1f083d
chaviw [Thu, 15 Mar 2018 03:19:59 +0000 (03:19 +0000)]
Merge "Set options for activity being brought to front." into pi-dev
am:
6468fd4ba2
Change-Id: I5452961d3617a5da25d231431f9a4ade594376af
Kweku Adams [Thu, 15 Mar 2018 03:01:47 +0000 (03:01 +0000)]
Merge "Making wakelock tag in PowerManager dump AUTO." into pi-dev
am:
bd036bf21b
Change-Id: Icdcf1ab4f3a31efc4cc88483a2e7edc09508bfaf
TreeHugger Robot [Thu, 15 Mar 2018 03:00:46 +0000 (03:00 +0000)]
Merge "Add notification category: CATEGORY_NAVIGATION; Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION." into pi-dev
Seigo Nonaka [Thu, 15 Mar 2018 02:57:04 +0000 (02:57 +0000)]
Merge "Set span boundary at word boundary in perf test" into pi-dev
am:
196996a4df
Change-Id: Ieabe0f37d54a3d5801c80ee75a4fa15edf2a699e
Yangster-mac [Thu, 15 Mar 2018 02:52:49 +0000 (02:52 +0000)]
Merge "Support slicing by chain." into pi-dev
am:
a825c8ee5d
Change-Id: I5a4144504f960e5ba342320a2e1861d8ec34a624
TreeHugger Robot [Thu, 15 Mar 2018 02:50:20 +0000 (02:50 +0000)]
Merge "Fix cleartext default for the manifest value" into pi-dev
Lucas Dupin [Thu, 15 Mar 2018 02:49:58 +0000 (02:49 +0000)]
Merge "Disable clicks on buttons without actions" into pi-dev
am:
9ba6ed4d12
Change-Id: I39ff5a23757977940c05432116316bf435ee90a0
TreeHugger Robot [Thu, 15 Mar 2018 02:43:58 +0000 (02:43 +0000)]
Merge "Update text alignment when using drawTextOnPath." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 02:39:33 +0000 (02:39 +0000)]
Merge "Add msg to shade when dnd is suppressing notis" into pi-dev
Roshan Pius [Thu, 15 Mar 2018 02:39:21 +0000 (02:39 +0000)]
Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev
am:
dbeb6bc3f1
Change-Id: Ib9b32466ea217703592f304d5b133d547a83f822
TreeHugger Robot [Thu, 15 Mar 2018 02:37:34 +0000 (02:37 +0000)]
Merge "Fix PIP settings icons shows in unexpanded state." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 02:35:55 +0000 (02:35 +0000)]
Merge "Set options for activity being brought to front." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 02:35:13 +0000 (02:35 +0000)]
Merge "Making wakelock tag in PowerManager dump AUTO." into pi-dev
Jack Yu [Thu, 15 Mar 2018 02:33:23 +0000 (02:33 +0000)]
Merge "Fixed data connection state callback not working" into pi-dev
am:
120f350719
Change-Id: Ic8e1db51fec4cc85aa2dafa708bf0570e13ae902
sqian [Thu, 1 Mar 2018 04:00:43 +0000 (20:00 -0800)]
Check AppOps bit for TelephonyManager#getForbiddenPlmns
Bug:
73884967
Test: Telephony Sanity and Compile
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
(cherry picked from commit
52102d28685b8b75a7f290ad42b31fc4029ee5cd)
Change-Id: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
TreeHugger Robot [Thu, 15 Mar 2018 02:29:53 +0000 (02:29 +0000)]
Merge "Set span boundary at word boundary in perf test" into pi-dev
Etan Cohen [Thu, 15 Mar 2018 02:28:20 +0000 (02:28 +0000)]
Merge "[RTT][AWARE] Minor update to distance documentation" into pi-dev
am:
5e278aedfa
Change-Id: I0114ed6f3364d70f03875d77e45d669afc280a59
TreeHugger Robot [Thu, 15 Mar 2018 02:27:15 +0000 (02:27 +0000)]
Merge "Support slicing by chain." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 02:26:50 +0000 (02:26 +0000)]
Merge "Disable clicks on buttons without actions" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 02:11:46 +0000 (02:11 +0000)]
Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev
Christopher Tate [Thu, 15 Mar 2018 02:10:26 +0000 (02:10 +0000)]
Merge "Don't time out startForegroundService when debugging the app" into pi-dev
am:
17c8224c08
Change-Id: Id14c2392d8f792addab046e86b9c82396ca2cbe0
TreeHugger Robot [Thu, 15 Mar 2018 02:07:55 +0000 (02:07 +0000)]
Merge "Fixed data connection state callback not working" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 02:07:13 +0000 (02:07 +0000)]
Merge "[RTT][AWARE] Minor update to distance documentation" into pi-dev
Bo Zhu [Thu, 15 Mar 2018 01:58:37 +0000 (01:58 +0000)]
Merge "DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath" into pi-dev
am:
6168374715
Change-Id: I2e7ee415c2f5e7849065473cecac7235a18e5173
TreeHugger Robot [Thu, 15 Mar 2018 01:53:39 +0000 (01:53 +0000)]
Merge "Don't time out startForegroundService when debugging the app" into pi-dev
Dan Zhang [Thu, 15 Mar 2018 01:49:37 +0000 (01:49 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]"
Robert Carr [Thu, 15 Mar 2018 01:43:43 +0000 (01:43 +0000)]
Merge changes I68dab076,Ife50c3d3,I705518be,I949fbe81 into pi-dev
am:
0a6e6e8911
Change-Id: Id4c5d4581bfc2aa08a3c6f351de1597b43cf20d3
TreeHugger Robot [Thu, 15 Mar 2018 01:36:24 +0000 (01:36 +0000)]
Merge "DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath" into pi-dev
Wale Ogunwale [Thu, 15 Mar 2018 01:35:24 +0000 (01:35 +0000)]
Merge "Added hackbod@ & ogunwale@ to display owners file." into pi-dev
am:
eca0aa82e2
Change-Id: Iff55c9d74936aa8f8ede0ff3b02ce353f6668e93
Suprabh Shukla [Thu, 15 Mar 2018 01:29:50 +0000 (01:29 +0000)]
Merge "Unhiding APIs in UsageEvents for public use" into pi-dev
am:
b33cef07f2
Change-Id: I6db57115f141dc3e84c89986c04a962d9bfe5b3f
Chris Wren [Wed, 14 Mar 2018 17:16:10 +0000 (13:16 -0400)]
use the dedicated latency field in logmaker
Bug:
65724609
Test: runtest systemui
Change-Id: Ic5d3f569c06f641454c356f64f773db59140fedc
Chris Wren [Wed, 14 Mar 2018 16:16:04 +0000 (12:16 -0400)]
add reserved latency field
Bug:
65724609
Test: make
Change-Id: I9bc8d9bf6818c93cd21c02962d93ab1193d56fc9
Pengquan Meng [Thu, 15 Mar 2018 01:24:26 +0000 (01:24 +0000)]
Merge "Telephony(MSIM): Default NW mode property for each slot" into pi-dev
am:
c6556e7cb6
Change-Id: I19d61eecdf2032e004e124e9c086383779b734e2
TreeHugger Robot [Thu, 15 Mar 2018 01:16:09 +0000 (01:16 +0000)]
Merge changes I68dab076,Ife50c3d3,I705518be,I949fbe81 into pi-dev
* changes:
Disable move animations for ScreenDecor overlays.
WindowManager: Use WindowSurfaceController for seamless rotation
Prevent freezing the display while rotating seamlessly.
Eliminate usage of global transaction for display configuration.
Wale Ogunwale [Thu, 15 Mar 2018 01:16:05 +0000 (01:16 +0000)]
Merge "Added hackbod@ & ogunwale@ to display owners file." into pi-dev
Matthew Ng [Thu, 15 Mar 2018 01:15:07 +0000 (01:15 +0000)]
Merge changes from topic "centralize-quick-3s" into pi-dev
am:
6a9088e093
Change-Id: I8b066ae3cc23edd6cc7e5442bc5151985df51244
Matthew Ng [Thu, 15 Mar 2018 01:10:06 +0000 (01:10 +0000)]
Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""
am:
2ea93b708d
Change-Id: Iea566c5e83acf561ac4112b0f594f965a7056097
TreeHugger Robot [Thu, 15 Mar 2018 01:08:33 +0000 (01:08 +0000)]
Merge "Unhiding APIs in UsageEvents for public use" into pi-dev
Wale Ogunwale [Thu, 15 Mar 2018 01:04:04 +0000 (18:04 -0700)]
Added hackbod@ & ogunwale@ to display owners file.
We need to be able to submit stuff while michaelwr@ is OOO.
For example: ag/
3690123
Test: can merge is stuff
Bug:
72038766
Change-Id: I1dd2260b54d95bbb6ebd27d871aeddfe3eefacdd
Pengquan Meng [Thu, 15 Mar 2018 01:01:15 +0000 (01:01 +0000)]
Merge "Telephony(MSIM): Default NW mode property for each slot" into pi-dev
Yohei Yukawa [Thu, 15 Mar 2018 00:54:22 +0000 (00:54 +0000)]
Merge "Also apply prefix when dumping isAllowedToUseHiddenApi" into pi-dev
am:
265b11ffb2
Change-Id: If24d9dfa23b4f5c3028ef08e6ccf454aede74519
TreeHugger Robot [Thu, 15 Mar 2018 00:53:19 +0000 (00:53 +0000)]
Merge changes from topic "centralize-quick-3s" into pi-dev
* changes:
Fixes crash on navbar using 3rd party launchers
Revert "Revert "Centralized quick step/scrub/switch logic (1/2)""
Lucas Dupin [Wed, 14 Mar 2018 19:39:00 +0000 (12:39 -0700)]
Disable clicks on buttons without actions
Test: navigate on lock screen with usb keyboard
Change-Id: I5cb6a605a3fca956c0f3148cdcee4807fb23f186
Fixes:
73718973
TreeHugger Robot [Thu, 15 Mar 2018 00:37:37 +0000 (00:37 +0000)]
Merge "Also apply prefix when dumping isAllowedToUseHiddenApi" into pi-dev
Seigo Nonaka [Wed, 14 Mar 2018 21:38:32 +0000 (14:38 -0700)]
Set span boundary at word boundary in perf test
The style span interval should be the same with word boundary. This
generates weird test case.
Bug:
72998298
Test: N/A
Change-Id: Id1132a455c8b1dd74e21eaeb259703a33ac3b01f
Kweku Adams [Thu, 15 Mar 2018 00:12:06 +0000 (17:12 -0700)]
Making wakelock tag in PowerManager dump AUTO.
Bug:
74837756
Test: N/A
Change-Id: If9b982c35eee8f2643e2bc2e2f5dbd1a0e00de12
Andreas Gampe [Thu, 15 Mar 2018 00:10:22 +0000 (00:10 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f into pi-dev
am:
216c28d446 -s ours
Change-Id: I5f43a1d5ad23ffaf482dac2cb0aa91398932b23e
Jack Yu [Wed, 14 Mar 2018 23:23:38 +0000 (16:23 -0700)]
Fixed data connection state callback not working
The old behavior of onDataConnectionStateChanged callback is that
if at least one data connection for one APN type (e.g. default,
mms, supl, ims, etc...) is connected, then it reports connected.
It only reports disconnected if data for all APN types are
disconnected.
Since now we have data connections are always connected. For example,
even if the user disables data, the unmetered IMS data remains
connected. In this case the client's onDataConnectionStateChanged
won't be called.
Now we changed the behavior of onDataConnectionStateChanged to
report the connection state for default APN type only. This matches
the behavior of TelephonyManager.getDataState().
Test: Manual
Bug:
73226433
Change-Id: I0744cf33337864c946af6e7d186bab78584acfa4
TreeHugger Robot [Wed, 14 Mar 2018 23:52:38 +0000 (23:52 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f into pi-dev
* changes:
Frameworks: Refactor FileDescriptorTable errors
Frameworks: Add app name to zygote abort
Frameworks: Refactor zygote abort code
Qingxi Li [Wed, 14 Mar 2018 23:24:44 +0000 (23:24 +0000)]
Merge "Add API to check extended APDU Supported" am:
fd4385e633
am:
19f487ec57 -s ours
Change-Id: I4216f0dddf533bab4d9db37cd1c8cc2e8555b71f
yro [Wed, 14 Mar 2018 23:21:17 +0000 (23:21 +0000)]
Merge "Add stats from storage manager to dumpsys result" into pi-dev
am:
8568931d6f
Change-Id: I0c27ed09388fb6be1abbbfb707b491feef70d6d9
Qingxi Li [Wed, 14 Mar 2018 23:17:14 +0000 (23:17 +0000)]
Merge "Add API to check extended APDU Supported"
am:
fd4385e633
Change-Id: I8f5441a58b8ca8b8aa2aa6138716c08749d6b814
Andrew Solovay [Wed, 14 Mar 2018 23:16:07 +0000 (23:16 +0000)]
Merge "docs: Javadoc typo fix" into pi-dev
am:
3731e47d23
Change-Id: I4b98269f78624f9dd62b859cad6977679f877f07
TreeHugger Robot [Wed, 14 Mar 2018 23:05:33 +0000 (23:05 +0000)]
Merge "Add stats from storage manager to dumpsys result" into pi-dev
Tracy Zhou [Wed, 14 Mar 2018 23:00:56 +0000 (16:00 -0700)]
Fix PIP settings icons shows in unexpanded state.
Change-Id: Ieb18fbd53dee443ae19e3a2f3f9d8d101e38c911
Fixes:
74598599
Test: atest
CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests
Andrew Solovay [Wed, 14 Mar 2018 22:59:22 +0000 (22:59 +0000)]
Merge "docs: Javadoc typo fix" into pi-dev
Todd Kennedy [Wed, 14 Mar 2018 22:41:23 +0000 (22:41 +0000)]
Merge "Enable local search for instant apps" into pi-dev
am:
35a6c58325
Change-Id: I6c459808616cb8aa400f5c98d329696afefa905a
Yangster-mac [Sun, 11 Mar 2018 07:22:59 +0000 (23:22 -0800)]
Support slicing by chain.
BUG: b/
73975181
Test: statsd test
Change-Id: I913ae0f68ff21ed0703bb5da9c60d3eaa3bf5981
Felipe Leme [Wed, 14 Mar 2018 22:36:19 +0000 (22:36 +0000)]
Merge "Improved Application.getAutofillClient()" into pi-dev
am:
070db35bfb
Change-Id: I3deb8585d4901b267d3071d678f0a3cfcb5539f8
chaviw [Wed, 14 Mar 2018 22:28:07 +0000 (15:28 -0700)]
Set options for activity being brought to front.
In the case where the activity is brought to the front instead of
creating a new activity, set the options for that ActivityRecord.
Fixes:
74793215
Test: Open app and see animation. Press home. Open same app again.
Animation works.
Change-Id: I1b8505d3db6f7de23b37e433b9ec9727b01444e5
TreeHugger Robot [Wed, 14 Mar 2018 22:23:24 +0000 (22:23 +0000)]
Merge "Enable local search for instant apps" into pi-dev
Roshan Pius [Wed, 14 Mar 2018 22:10:18 +0000 (15:10 -0700)]
WifiConfiguration: Undeprecate WPA_PSK
This is needed for client mode operations for configuring WPA_PSK
networks. There is no alternative public value for WPA_PSK.
The intention was to deprecate usage of this value for AP
mode, but since we share the same object across client & AP mode
operations, we cannot mark this field deprecated.
Bug:
72332080
Test: make update-api
Change-Id: I75f675b630080d853422f945d7cbc37c5f205fde
Android Build Merger (Role) [Wed, 14 Mar 2018 22:16:13 +0000 (22:16 +0000)]
Merge "Merge "Add ability to filter remote animation adapter by activity type" into pi-dev am:
c175631670" into pi-dev-plus-aosp
Jorim Jaggi [Wed, 14 Mar 2018 22:15:40 +0000 (22:15 +0000)]
Merge "Add ability to filter remote animation adapter by activity type" into pi-dev
am:
c175631670
Change-Id: I12c6890345fe5cc41f717bb8e9cc1c6248298dd8
yinxu [Wed, 14 Mar 2018 22:13:40 +0000 (22:13 +0000)]
Merge "Catch the RuntimeException for stopScan()" am:
0715570648
am:
ca8b90d7e0 -s ours
Change-Id: I09b70ab24e2a552b8c984e9067f9f9d721435811
Bo Zhu [Fri, 9 Mar 2018 20:32:13 +0000 (12:32 -0800)]
DO NOT MERGE Fix the null return value of getTrustedHardwareCertPath
I forgot to serialize and deserialize it in the last CL adding it.
Bug:
74359698
Change-Id: I34f9225dc63b55223c2a7db23ee3fa6abf056a0d
Test: atest RecoveryControllerHostTest
(cherry picked from commit
b4d2cc684dcd94a1482c8c2e66d421d481032833)
TreeHugger Robot [Wed, 14 Mar 2018 22:02:10 +0000 (22:02 +0000)]
Merge "Improved Application.getAutofillClient()" into pi-dev
Kweku Adams [Wed, 14 Mar 2018 22:02:03 +0000 (22:02 +0000)]
Merge "incidentd: cleaning up settings.proto" into pi-dev
am:
41b5ece135
Change-Id: Ic1fd23d00921e373219701623175924fe09d618d
Treehugger Robot [Wed, 14 Mar 2018 21:59:58 +0000 (21:59 +0000)]
Merge "Add API to check extended APDU Supported"
yinxu [Wed, 14 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Catch the RuntimeException for stopScan()"
am:
0715570648
Change-Id: I751b4640654826499a9885db657bc0f4da2358f1
Aseem Kumar [Wed, 14 Mar 2018 21:55:55 +0000 (21:55 +0000)]
Merge "Disable RecoverableKeyStoreManager for custom lockscreens." into pi-dev
am:
1c4d0287c5
Change-Id: I9d808f184b1b0cc2686953bed70977619a45284b
Jorim Jaggi [Wed, 14 Mar 2018 21:55:07 +0000 (21:55 +0000)]
Merge "Add ability to filter remote animation adapter by activity type" into pi-dev
Adora Zhang [Mon, 12 Mar 2018 21:07:50 +0000 (14:07 -0700)]
Add notification category: CATEGORY_NAVIGATION;
Add @SystemApi @hide notification categories: CATEGORY_CAR_EMERGENCY, CATEGORY_CAR_WARNING, and CATEGORY_CAR_INFORMATION.
Bug:
74546526
Test: runtest -x tests/app/src/android/app/cts/NotificationTest.java
Change-Id: Ib997992e039d2eddbd9c744816c35e279f9f9682
Julia Reynolds [Wed, 14 Mar 2018 21:48:32 +0000 (21:48 +0000)]
Merge changes Iaf63b4e8,Ie76044d4 into pi-dev
am:
a60e6f81df
Change-Id: I3d325f078078abbeb4f949271ca45fe1e04f02b4
TreeHugger Robot [Wed, 14 Mar 2018 21:31:32 +0000 (21:31 +0000)]
Merge "incidentd: cleaning up settings.proto" into pi-dev
Aseem Kumar [Wed, 14 Mar 2018 21:29:12 +0000 (21:29 +0000)]
Merge "Disable RecoverableKeyStoreManager for custom lockscreens." into pi-dev
Suprabh Shukla [Fri, 9 Mar 2018 02:34:15 +0000 (18:34 -0800)]
Unhiding APIs in UsageEvents for public use
These apis are needed to interpret standby bucket change history
when using UsageStatsManager#queryEventsForSelf
Test: atest android.app.usage.cts.UsageStatsTest#testQueryEventsForSelf
Bug:
71906213
Change-Id: Ib9f458bf32089ad30c97eca9dd5cc4df5a392191
Eric Schwarzenbach [Wed, 14 Mar 2018 21:26:00 +0000 (21:26 +0000)]
Merge "Add Duplex mode to ServiceState." into pi-dev
am:
8062b76f21 -s ours
Change-Id: I1e1f6bfffdd074ea1d6cfb28a0d471b4ce435041
OSDN Git Service
