OSDN Git Service
Philip P. Moltmann [Fri, 16 Feb 2018 19:14:54 +0000 (11:14 -0800)]
Add feature annotation to UsbManager
Test: Built
Change-Id: Ib81f8a8deb38c7b7397b4119c98b92de1fe5f17f
Benedict Wong [Fri, 16 Feb 2018 20:51:37 +0000 (20:51 +0000)]
Merge "Correct bug in IpSecTransformTest" am:
999d1fc172 am:
c9f558d46d
am:
12cb5aae57
Change-Id: Ic29f13053365f3de8d01f9c38f8460d92748a41d
Jeff Sharkey [Fri, 16 Feb 2018 20:45:41 +0000 (20:45 +0000)]
Merge "Add RequiresFeature annotation."
Jeff Sharkey [Fri, 16 Feb 2018 17:14:57 +0000 (10:14 -0700)]
Add RequiresFeature annotation.
Certain APIs require that a device have a specific feature to operate
correctly, so start annotating them.
Test: builds, boots
Bug:
72284763
Change-Id: Ie2f30284bdfdb6acc4067f434eba3b5433837606
Exempt-From-Owner-Approval: simple annotations
Benedict Wong [Fri, 16 Feb 2018 20:43:12 +0000 (20:43 +0000)]
Merge "Correct bug in IpSecTransformTest" am:
999d1fc172
am:
c9f558d46d
Change-Id: I990729e8592e70898867fe72a3d628fd7f9fdaf0
Benedict Wong [Fri, 16 Feb 2018 20:28:18 +0000 (20:28 +0000)]
Merge "Correct bug in IpSecTransformTest"
am:
999d1fc172
Change-Id: If99a991052a821f43b8238a47d0d2c7e00362bc3
TreeHugger Robot [Fri, 16 Feb 2018 20:06:54 +0000 (20:06 +0000)]
Merge "Fix javadoc in SettingsSliceContract"
TreeHugger Robot [Fri, 16 Feb 2018 19:06:53 +0000 (19:06 +0000)]
Merge "Allowing Typeface as a param in TypefaceSpan."
TreeHugger Robot [Fri, 16 Feb 2018 18:46:50 +0000 (18:46 +0000)]
Merge "Adding maximum input size checks"
Jeff Sharkey [Fri, 16 Feb 2018 18:46:29 +0000 (18:46 +0000)]
Merge "Grant DCS storage access; better OBB errors."
Jerry Zhang [Fri, 16 Feb 2018 18:44:23 +0000 (18:44 +0000)]
Merge "Remove urb request size maximum for P api"
Benedict Wong [Fri, 16 Feb 2018 18:32:05 +0000 (18:32 +0000)]
Merge "Correct bug in IpSecTransformTest"
TreeHugger Robot [Fri, 16 Feb 2018 18:24:18 +0000 (18:24 +0000)]
Merge "Optimization: don't call AFM.notifyValueChanged() when value didn't change."
Andreas Gampe [Fri, 16 Feb 2018 18:12:41 +0000 (18:12 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos" am:
4eaa22f24e am:
1c14209950
am:
63f4ea33e7 -s ours
Change-Id: I6672dabe7fdda3599b385b4cf34e7a649123479c
Oscar Shu [Fri, 16 Feb 2018 18:09:01 +0000 (18:09 +0000)]
Merge "Deprecate supplicant related stuff in WifiManager"
Oscar Shu [Fri, 16 Feb 2018 18:08:29 +0000 (18:08 +0000)]
Merge "Deprecate WpsInfo"
Bruno Martins [Fri, 16 Feb 2018 18:06:03 +0000 (18:06 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase" am:
977bcea1f0 am:
a1f96ff00e
am:
db10020d15
Change-Id: Id635f3ca0463165a149ffffc9169676a486a4442
Andreas Gampe [Fri, 16 Feb 2018 17:57:14 +0000 (17:57 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos" am:
4eaa22f24e
am:
1c14209950
Change-Id: Ib664802f2a8673ba0d1504a9b93f764ae993b044
Bruno Martins [Fri, 16 Feb 2018 17:50:09 +0000 (17:50 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase" am:
977bcea1f0
am:
a1f96ff00e
Change-Id: Id61a5fe96c065377916a630da4842bd675c8ab14
Andreas Gampe [Fri, 16 Feb 2018 17:46:08 +0000 (17:46 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
am:
4eaa22f24e
Change-Id: I376b8bea0e1c57a6f7e78970bc919d05d1ed372d
Bruno Martins [Fri, 16 Feb 2018 17:41:30 +0000 (17:41 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
am:
977bcea1f0
Change-Id: I692e2c21f92d0e8eff5c9114e012cd90e84f31e9
TreeHugger Robot [Fri, 16 Feb 2018 17:31:42 +0000 (17:31 +0000)]
Merge "Resupport long compare"
TreeHugger Robot [Fri, 16 Feb 2018 17:30:43 +0000 (17:30 +0000)]
Merge "Adds locks to ConfigManager in statsd."
David Brazdil [Fri, 16 Feb 2018 17:29:01 +0000 (17:29 +0000)]
Merge "Add more hidden API into light greylist"
Matthew Fritze [Fri, 16 Feb 2018 17:28:34 +0000 (09:28 -0800)]
Fix javadoc in SettingsSliceContract
Test: none. only comment change.
Change-Id: I6d4419798a7a59ad9a9be7b4e41bfc50c3cf158e
Fixes:
73392084
TreeHugger Robot [Fri, 16 Feb 2018 17:28:32 +0000 (17:28 +0000)]
Merge "Remove a statsd duration anomaly sanity check."
TreeHugger Robot [Fri, 16 Feb 2018 17:06:17 +0000 (17:06 +0000)]
Merge "MediaPlayer2: initial code for playlist support"
Mathew Inwood [Fri, 16 Feb 2018 16:48:28 +0000 (16:48 +0000)]
Merge "Hidden API blacklisting killswitch." am:
46656fa28e am:
84259cea59
am:
a8bb7189ba -s ours
Change-Id: Ia1137d759b1618e2ec1acbd07e4458f0a625b124
Mathew Inwood [Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)]
Merge "Hidden API blacklisting killswitch." am:
46656fa28e
am:
84259cea59
Change-Id: Ia0bcbfb2cdc84a6a8a82f82ecda82f46ba46dab1
Mathew Inwood [Fri, 16 Feb 2018 16:31:26 +0000 (16:31 +0000)]
Merge "Hidden API blacklisting killswitch."
am:
46656fa28e
Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e
Felipe Leme [Wed, 14 Feb 2018 23:08:58 +0000 (15:08 -0800)]
Optimization: don't call AFM.notifyValueChanged() when value didn't change.
Test: manual verification
Test: atest CtsAutoFillServiceTestCases
Bug:
73078981
Change-Id: Ib0a40d4ab0e6f4a1300622fa4d7a2f6026aa98a1
Kevin Neas [Fri, 16 Feb 2018 16:06:19 +0000 (16:06 +0000)]
Merge "AppLaunch tests for Wear"
Treehugger Robot [Fri, 16 Feb 2018 16:05:19 +0000 (16:05 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
Felipe Leme [Fri, 16 Feb 2018 16:04:17 +0000 (16:04 +0000)]
Merge "Revert an incorrectly changed API call"
Evan Laird [Fri, 16 Feb 2018 15:37:22 +0000 (15:37 +0000)]
Merge "Revert "[QS] Add header tooltip for long press""
Evan Laird [Fri, 16 Feb 2018 15:25:53 +0000 (15:25 +0000)]
Revert "[QS] Add header tooltip for long press"
This reverts commit
22caf078e493ff49e021a8f5af80ac10d4926feb.
Reason for revert: Quick settings is no longer expanding properly. Reverting this fixes it
Change-Id: I63b82e948316726067214b088016661785982e3a
Treehugger Robot [Fri, 16 Feb 2018 15:20:23 +0000 (15:20 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
Tim Volodine [Fri, 16 Feb 2018 15:00:27 +0000 (15:00 +0000)]
Merge "WebView Tracing API: address comments from the API council."
Daniel Sandler [Fri, 16 Feb 2018 15:00:21 +0000 (15:00 +0000)]
Merge "Clean up DozeService plugin listeners."
Beverly Tai [Fri, 16 Feb 2018 14:23:37 +0000 (14:23 +0000)]
Merge "Animate charging text on lockscreen"
Chavi Weingarten [Fri, 16 Feb 2018 14:05:06 +0000 (14:05 +0000)]
Merge "Revert "Use destroy in transaction for animation""
Wale Ogunwale [Fri, 16 Feb 2018 12:56:48 +0000 (12:56 +0000)]
Merge "Move home stack forward while entering split-screen in some cases"
Treehugger Robot [Fri, 16 Feb 2018 11:50:20 +0000 (11:50 +0000)]
Merge "Hidden API blacklisting killswitch."
Nicolas Geoffray [Fri, 16 Feb 2018 11:28:13 +0000 (11:28 +0000)]
Merge "Small cleanup in AppLaunch."
Leon Scroggins [Fri, 16 Feb 2018 11:25:23 +0000 (11:25 +0000)]
Merge "Reland "Call ImageDecoder directly in ResourcesImpl""
Mathew Inwood [Thu, 15 Feb 2018 10:28:06 +0000 (10:28 +0000)]
Hidden API blacklisting killswitch.
Just support "*" for now, meaning disable all API blacklisting for all
apps.
Test: Manually verified by:
- installing test app that accesses hidden API
- manually blacklist the API
- $ adb shell settings put global hidden_api_blacklist_exemptions \\*
This is a cherry pick of change I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
from internal master.
Merged-In: I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
Change-Id: Ibb2a1d054c1b099fc6093e37f24b2ed421a2313c
Peter Visontay [Fri, 16 Feb 2018 09:54:09 +0000 (09:54 +0000)]
Merge "Remove the OP_REQUEST_DELETE_PACKAGES op from the list of runtime permissions."
Svet Ganov [Fri, 16 Feb 2018 08:11:39 +0000 (00:11 -0800)]
Revert an incorrectly changed API call
Test: cts-tradefed run cts -m CtsAutoFillServiceTestCases
bug:
73508533
Change-Id: Ie103814294230177ffddf957ce8c5adcb84686c3
TreeHugger Robot [Fri, 16 Feb 2018 08:09:29 +0000 (08:09 +0000)]
Merge "ContextWrapper should check before calling wrapped instance for autofill compat"
Hugo Benichi [Fri, 16 Feb 2018 07:58:57 +0000 (07:58 +0000)]
Merge "Add missing'}' in javadoc of public API method" am:
f50d9fbdc1 am:
054bed5968
am:
7b2ffeff58
Change-Id: I2cfda60077c57d151fb8599845cd202bbc4e625d
Hugo Benichi [Fri, 16 Feb 2018 07:50:57 +0000 (07:50 +0000)]
Merge "Add missing'}' in javadoc of public API method" am:
f50d9fbdc1
am:
054bed5968
Change-Id: I51ad1f6b8d42f4c791c07d41297f02d3e798ccd9
Hugo Benichi [Fri, 16 Feb 2018 07:43:08 +0000 (07:43 +0000)]
Merge "Add missing'}' in javadoc of public API method"
am:
f50d9fbdc1
Change-Id: I3afcd9a3752ff6d158d68ca3ce19272151c1908c
TreeHugger Robot [Fri, 16 Feb 2018 07:05:15 +0000 (07:05 +0000)]
Merge "Camera: update API for external camera"
TreeHugger Robot [Fri, 16 Feb 2018 06:39:21 +0000 (06:39 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
Calin Juravle [Fri, 16 Feb 2018 06:01:34 +0000 (06:01 +0000)]
Merge "Pass the compilation reason to dexopt" am:
b0817b238a am:
68024999b7
am:
e31b7c4d24
Change-Id: Id200b36eaaca791932da03a41383e5ee055319cb
TreeHugger Robot [Fri, 16 Feb 2018 05:52:06 +0000 (05:52 +0000)]
Merge "New Autofill API: notifyViewClicked()"
TreeHugger Robot [Fri, 16 Feb 2018 05:51:58 +0000 (05:51 +0000)]
Merge "This cl formats incidentd and makes it easier for debugging."
Calin Juravle [Fri, 16 Feb 2018 05:45:10 +0000 (05:45 +0000)]
Merge "Pass the compilation reason to dexopt" am:
b0817b238a
am:
68024999b7
Change-Id: I6a4e3dd19cf612bd698bff0f60de2ef3fac35604
Calin Juravle [Fri, 16 Feb 2018 05:34:41 +0000 (05:34 +0000)]
Merge "Pass the compilation reason to dexopt"
am:
b0817b238a
Change-Id: Id8b60a2963b35a44c9420d9846283091b5e0619e
Kevin Neas [Fri, 16 Feb 2018 01:53:48 +0000 (17:53 -0800)]
AppLaunch tests for Wear
Wear needs specific changes that the platform team is unable to support.
Most of this code is an exact copy of the AppLaunch file, with a specific
check to not kill the app is Wear Home.
Change-Id: I2332416d61676b52518d6988849271e0b0777009
Svet Ganov [Thu, 15 Feb 2018 21:16:20 +0000 (13:16 -0800)]
ContextWrapper should check before calling wrapped instance for autofill compat
Test: manual
bug:
73339515
Change-Id: I22cb219d6efb581d63c86de961772d948a7546da
Makoto Onuki [Fri, 16 Feb 2018 04:09:17 +0000 (04:09 +0000)]
Merge "Don't load config on the initializing thread"
TreeHugger Robot [Fri, 16 Feb 2018 03:49:16 +0000 (03:49 +0000)]
Merge "Audio recording sources: annotate permissions"
TreeHugger Robot [Fri, 16 Feb 2018 03:43:50 +0000 (03:43 +0000)]
Merge "Fix crash when starting quickscrub while ending quickscrub animation."
Nathan Harold [Fri, 16 Feb 2018 03:37:09 +0000 (03:37 +0000)]
Merge "Fix LTE Timing Advance Doc String" am:
3df127aefe am:
c52bec3acb
am:
22a4780b5f
Change-Id: I1a32863add6f7b12f9ee6b3fea7895b53ffe61a2
TreeHugger Robot [Fri, 16 Feb 2018 03:32:31 +0000 (03:32 +0000)]
Merge "Update text OWNERS with set noparent"
Android Build Merger (Role) [Fri, 16 Feb 2018 03:31:14 +0000 (03:31 +0000)]
Merge "Merge "NfcTile: Avoid NPE during boot up phase" am:
3a419fe212 am:
3628537476 am:
7a5f915ff7"
Bruno Martins [Fri, 16 Feb 2018 03:30:44 +0000 (03:30 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase" am:
3a419fe212 am:
3628537476
am:
7a5f915ff7
Change-Id: I7b7c0374e1f001fffd25c6ee3239ab675054ac9b
TreeHugger Robot [Fri, 16 Feb 2018 03:29:36 +0000 (03:29 +0000)]
Merge "Add LOCAL_MIN_SDK_VERSION to run on older builds"
Nathan Harold [Fri, 16 Feb 2018 03:19:43 +0000 (03:19 +0000)]
Merge "Fix LTE Timing Advance Doc String" am:
3df127aefe
am:
c52bec3acb
Change-Id: I352f5d1e72b48d7a4944b0f0935fe03d4c5979c1
Treehugger Robot [Fri, 16 Feb 2018 03:19:35 +0000 (03:19 +0000)]
Merge "Add missing'}' in javadoc of public API method"
Bruno Martins [Fri, 16 Feb 2018 03:14:38 +0000 (03:14 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase" am:
3a419fe212
am:
3628537476
Change-Id: I383b289d734ed72f248e004c8767357aca2ac578
Nathan Harold [Fri, 16 Feb 2018 03:05:49 +0000 (03:05 +0000)]
Merge "Fix LTE Timing Advance Doc String"
am:
3df127aefe
Change-Id: I3dfbe863080d3a5aadb01e77cd5a28861045b696
Bruno Martins [Fri, 16 Feb 2018 03:01:36 +0000 (03:01 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase"
am:
3a419fe212
Change-Id: I352028c1974c38f2a88ffb6bdc49da7bd28d2204
Dan Zhang [Fri, 16 Feb 2018 02:55:19 +0000 (02:55 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access" am:
549082991d am:
1494c01109
am:
aa0fdc50ec
Change-Id: Ib99f494e0af49d9ad6b0df8a17538fbc80b48df8
Benedict Wong [Fri, 16 Feb 2018 02:47:49 +0000 (18:47 -0800)]
Correct bug in IpSecTransformTest
testCreateTransformsWithSameConfigEqual used assertFalse rather than
assertTrue
Bug:
69385347
Test: Passing on walleye
Change-Id: I8caa26e184e8bfc3e8acc9061d85c22d27ebf448
TreeHugger Robot [Fri, 16 Feb 2018 02:51:32 +0000 (02:51 +0000)]
Merge "Add the rest of the nav bar assets for quick step (1/2)"
Bookatz [Fri, 16 Feb 2018 02:45:00 +0000 (18:45 -0800)]
Resupport long compare
In ag/
3554499 we made it so that comparisons of longs was supported.
That support was apparantly deleted by accident during a refactoring of
code, so this adds it back.
Bug:
73509837
Test: it gets used in run cts-dev -m CtsStatsdHostTestCases -t android.cts.statsd.alert.AnomalyDetectionTests#testCountAnomalyDetection
Change-Id: I3dbe7da61bbfb3e9982fd1e0cc7d4658b0168690
Dake Gu [Fri, 16 Feb 2018 02:35:01 +0000 (02:35 +0000)]
Merge "Autofill: failing testClickCustomButton caused by fullscreen CL"
Bruno Martins [Fri, 16 Feb 2018 02:26:56 +0000 (02:26 +0000)]
Merge "DndTile: Avoid NPE during boot phase" am:
e134d23a7a am:
fe607c0e2b
am:
60281b4f07
Change-Id: I24749f6c1b61058b1053b280afae751ed0a23877
Calin Juravle [Fri, 16 Feb 2018 02:25:48 +0000 (02:25 +0000)]
Merge "Pass the compilation reason to dexopt"
Dan Zhang [Fri, 16 Feb 2018 02:21:04 +0000 (02:21 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access" am:
549082991d
am:
1494c01109
Change-Id: I74f59f35e1d78bdd9dcef57a939ec7a7af625049
Android Build Merger (Role) [Fri, 16 Feb 2018 02:19:38 +0000 (02:19 +0000)]
Merge "Merge "Un-hide Connection-side RTT APIs for Dialer" am:
d35e81d615 am:
01ae6fc2cd am:
8e1b207ba5 -s ours"
Hall Liu [Fri, 16 Feb 2018 02:17:24 +0000 (02:17 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer" am:
d35e81d615 am:
01ae6fc2cd
am:
8e1b207ba5 -s ours
Change-Id: I79735b6ff618473dd7f421acbac1460995a74efa
Dan Zhang [Fri, 16 Feb 2018 02:07:15 +0000 (02:07 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access"
am:
549082991d
Change-Id: I86dba1aa8ee360d5f813d3108902d6affd74b13f
Hall Liu [Fri, 16 Feb 2018 02:04:16 +0000 (02:04 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer" am:
d35e81d615 am:
01ae6fc2cd
am:
8e1b207ba5 -s ours
Change-Id: Id1c88b15b7ef2a4b1426cee344f38303dcce782e
Jean-Michel Trivi [Fri, 16 Feb 2018 01:57:08 +0000 (01:57 +0000)]
Merge "AudioPolicy: media dynamic mix is fixed volume"
Bruno Martins [Fri, 16 Feb 2018 01:52:44 +0000 (01:52 +0000)]
Merge "DndTile: Avoid NPE during boot phase" am:
e134d23a7a
am:
fe607c0e2b
Change-Id: I58e63317a1c842e49a072507565c546789bb01ad
Treehugger Robot [Fri, 16 Feb 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Fix LTE Timing Advance Doc String"
Hall Liu [Fri, 16 Feb 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer" am:
d35e81d615
am:
01ae6fc2cd
Change-Id: Iaaf10ec63261a38f928dca9e8d91c9ab3e74ae34
Bruno Martins [Fri, 16 Feb 2018 01:40:50 +0000 (01:40 +0000)]
Merge "DndTile: Avoid NPE during boot phase"
am:
e134d23a7a
Change-Id: Iff3b41e08abc89956b924b40b6d72bf79a294eb0
Android Build Merger (Role) [Fri, 16 Feb 2018 01:37:42 +0000 (01:37 +0000)]
Merge "Merge "Add setting and logging for RTT" am:
b823d08d21 am:
1c2da9f909 am:
1b7261996e -s ours"
Hall Liu [Fri, 16 Feb 2018 01:37:01 +0000 (01:37 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer"
am:
d35e81d615
Change-Id: I2da7e7766d131500167f745cc50ae882edc832cf
Hall Liu [Fri, 16 Feb 2018 01:36:22 +0000 (01:36 +0000)]
Merge "Add setting and logging for RTT" am:
b823d08d21 am:
1c2da9f909
am:
1b7261996e -s ours
Change-Id: Id48f806ab4f8d991af12e33bae51d4683b48bce2
Treehugger Robot [Fri, 16 Feb 2018 01:34:43 +0000 (01:34 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase"
Andreas Gampe [Thu, 15 Feb 2018 23:12:38 +0000 (15:12 -0800)]
Framework: Disable [MissingOverride] for platformprotos
Bug:
72714520
Test: m javac-check-platformprotos RUN_ERROR_PRONE=true
Merged-In: I00f5a588fa74621d4c35dc4e39b54536815ad476
Change-Id: I00f5a588fa74621d4c35dc4e39b54536815ad476
TreeHugger Robot [Fri, 16 Feb 2018 01:34:00 +0000 (01:34 +0000)]
Merge "Camera2: Update logical multi-camera requirement"
TreeHugger Robot [Fri, 16 Feb 2018 01:30:41 +0000 (01:30 +0000)]
Merge "Camera: Remove surface sharing format limitation"
Brian Young [Fri, 16 Feb 2018 01:18:53 +0000 (01:18 +0000)]
Merge "Add "Unlocked device required" parameter to keys"
Hall Liu [Fri, 16 Feb 2018 01:18:30 +0000 (01:18 +0000)]
Merge "Add setting and logging for RTT" am:
b823d08d21
am:
1c2da9f909
Change-Id: Ic5ab105e5b2c3ad3866bee4d7dd5a6d8427adc74
OSDN Git Service
