Martijn Coenen
37a08d4bf4
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev am: 35312fd4c6
...
am: 23a0f58eea
2017-04-30 14:01:00 +00:00
Martijn Coenen
23a0f58eea
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev
...
am: 35312fd4c6
2017-04-30 13:53:54 +00:00
Martijn Coenen
35312fd4c6
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev
2017-04-30 13:47:12 +00:00
Clara Bayarri
3b89f5ef21
Merge "Restricted Context layout font loading in TextView" into oc-dev am: 7f90a9fdb0
...
am: 8f21dc7811
2017-04-30 07:04:12 +00:00
Svet Ganov
c5ef292548
Merge "Address API council comments" into oc-dev am: 4c60abc9ae
...
am: 4ad7cb3347
2017-04-30 06:58:29 +00:00
Clara Bayarri
8f21dc7811
Merge "Restricted Context layout font loading in TextView" into oc-dev
...
am: 7f90a9fdb0
2017-04-30 06:55:55 +00:00
TreeHugger Robot
7f90a9fdb0
Merge "Restricted Context layout font loading in TextView" into oc-dev
2017-04-30 06:50:43 +00:00
Svet Ganov
4ad7cb3347
Merge "Address API council comments" into oc-dev
...
am: 4c60abc9ae
2017-04-30 06:49:57 +00:00
TreeHugger Robot
4c60abc9ae
Merge "Address API council comments" into oc-dev
2017-04-30 06:43:15 +00:00
Ajay Panicker
c29bb4a394
Limit btsnoop file size (3/8)
...
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
(cherry picked from commit 00e82f235c
2017-04-30 01:58:41 +00:00
Adam Lesinski
42dd85aee7
Merge changes I446fb6ab,Ife3bbd29 into oc-dev am: 53c9898e79
...
am: 66534ef01c
2017-04-29 20:50:20 +00:00
Adam Lesinski
66534ef01c
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
...
am: 53c9898e79
2017-04-29 20:44:17 +00:00
TreeHugger Robot
53c9898e79
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
...
* changes:
Valid resource IDs may be negative
AAPT2: Workaround for findViewById with package ID > 0x7f
2017-04-29 20:38:20 +00:00
Esteban Talavera
936a32b455
Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
...
am: 5bb8294f92
2017-04-29 19:55:13 +00:00
TreeHugger Robot
5bb8294f92
Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
2017-04-29 19:49:35 +00:00
Jeff Sharkey
1e07905467
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev am: e14159d2c5
...
am: 4be5c41542
2017-04-29 19:15:35 +00:00
Jeff Sharkey
e8acf307a8
Merge "Experimental features only on debuggable builds." into oc-dev am: d9f6946c42
...
am: 8e19424e6f
2017-04-29 19:12:39 +00:00
Jeff Sharkey
382363873b
Merge "API fixes for Companion renaming" into oc-dev am: 0a482bda21
...
am: b5a5033224
2017-04-29 19:10:35 +00:00
Jeff Sharkey
4be5c41542
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
...
am: e14159d2c5
2017-04-29 17:48:28 +00:00
Jeff Sharkey
8e19424e6f
Merge "Experimental features only on debuggable builds." into oc-dev
...
am: d9f6946c42
2017-04-29 17:42:42 +00:00
Jeff Sharkey
e14159d2c5
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
2017-04-29 17:38:59 +00:00
Jeff Sharkey
d9f6946c42
Merge "Experimental features only on debuggable builds." into oc-dev
2017-04-29 17:33:58 +00:00
Jeff Sharkey
b5a5033224
Merge "API fixes for Companion renaming" into oc-dev
...
am: 0a482bda21
2017-04-29 17:22:04 +00:00
Jeff Sharkey
0a482bda21
Merge "API fixes for Companion renaming" into oc-dev
2017-04-29 17:11:39 +00:00
Jeff Sharkey
15971f8328
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev am: 408ec0b463
...
am: 11188aee8a
2017-04-29 16:53:35 +00:00
Jeff Sharkey
11188aee8a
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
...
am: 408ec0b463
2017-04-29 16:44:11 +00:00
Jeff Sharkey
408ec0b463
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
2017-04-29 16:39:39 +00:00
Phil Weaver
6c6aac0f2f
Merge "A11y changes for API council" into oc-dev am: 060f0f0341
...
am: 3ed7b9e257
2017-04-29 16:12:30 +00:00
Phil Weaver
3ed7b9e257
Merge "A11y changes for API council" into oc-dev
...
am: 060f0f0341
2017-04-29 16:02:19 +00:00
TreeHugger Robot
060f0f0341
Merge "A11y changes for API council" into oc-dev
2017-04-29 15:54:27 +00:00
Jakub Pawlowski
62c36e1c17
Merge "Bluetooth: bluetooth.le API fixes" into oc-dev
2017-04-29 06:11:41 +00:00
Philip P. Moltmann
11f1bb3967
Merge "Make autofilled highlight an attribute" into oc-dev am: c7bd554d06
...
am: 5732faa336
2017-04-29 05:43:45 +00:00
Philip P. Moltmann
9432516fe4
Merge "Add constant for autofill-service-add URL" into oc-dev am: 09d8db0381
...
am: b29e0906f9
2017-04-29 05:32:32 +00:00
Philip P. Moltmann
5732faa336
Merge "Make autofilled highlight an attribute" into oc-dev
...
am: c7bd554d06
2017-04-29 05:32:12 +00:00
Philip P. Moltmann
b29e0906f9
Merge "Add constant for autofill-service-add URL" into oc-dev
...
am: 09d8db0381
2017-04-29 05:24:03 +00:00
Philip P. Moltmann
c7bd554d06
Merge "Make autofilled highlight an attribute" into oc-dev
2017-04-29 05:16:40 +00:00
Philip P. Moltmann
09d8db0381
Merge "Add constant for autofill-service-add URL" into oc-dev
2017-04-29 05:14:41 +00:00
Yifan Hong
62af5b0e63
Merge "Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958 am: e0bf06dd9e am: 5fe979b404" into oc-dev-plus-aosp
...
am: a38025e787
2017-04-29 03:28:51 +00:00
Yifan Hong
6196ab62fb
Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958 am: e0bf06dd9e
...
am: 5fe979b404
2017-04-29 03:19:09 +00:00
Christopher Tate
bc222b842d
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev am: 78a00503db
...
am: 3f9418bf0d
2017-04-29 03:17:07 +00:00
Yifan Hong
5fe979b404
Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958
...
am: e0bf06dd9e
2017-04-29 03:12:52 +00:00
Christopher Tate
3f9418bf0d
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev
...
am: 78a00503db
2017-04-29 03:11:43 +00:00
TreeHugger Robot
78a00503db
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev
2017-04-29 03:05:29 +00:00
Lifu Tang
a771ca7bab
Merge "Throttle location update rate in proximity alert" into oc-dev am: 23a66d44ea
...
am: 2307be9c47
2017-04-29 03:00:12 +00:00
Treehugger Robot
4f8a375958
Merge "Add android.os.VintfRuntimeInfo"
2017-04-29 03:00:08 +00:00
Lifu Tang
2307be9c47
Merge "Throttle location update rate in proximity alert" into oc-dev
...
am: 23a66d44ea
2017-04-29 02:52:37 +00:00
TreeHugger Robot
23a66d44ea
Merge "Throttle location update rate in proximity alert" into oc-dev
2017-04-29 02:48:28 +00:00
Yifan Hong
1bda67369c
Add android.os.VintfRuntimeInfo
...
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.
Bug: 28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
2017-04-28 17:10:28 -07:00
Renat Aksitov
3040be2b5d
Merge "Voice Messaging Intent API."
2017-04-29 00:07:19 +00:00
Svet Ganov
f965b87a78
Address API council comments
...
bug:37769694
bug:37322491
Change-Id: I931cfb5ea5fef1505a97b169125ed2cdaaa3d6ff
2017-04-28 23:45:17 +00:00
