OSDN Git Service
Miao-chen Chou [Fri, 16 Mar 2018 01:30:30 +0000 (01:30 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core" am:
00cc1847d3
am:
922ae0237f
Change-Id: Ifd790251d6531d3556af7b470e681f06f3e25070
Qingxi Li [Fri, 16 Mar 2018 01:18:07 +0000 (01:18 +0000)]
Merge "[UI Tweak] Move PIN eSIM error message button position" into pi-dev
am:
2ac51aab99
Change-Id: I604ee5e612fe0207f0a9eb3f605f966f6e5cdb37
Miao-chen Chou [Fri, 16 Mar 2018 01:13:07 +0000 (01:13 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
am:
00cc1847d3
Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
Wyatt Riley [Fri, 16 Mar 2018 01:10:28 +0000 (01:10 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev am:
38860f2cab am:
4b8765ff4a am:
3b0285794a
am:
06fd47a0b8
Change-Id: I5180224e6be04b7043232b3c13c32178780db516
David Chen [Fri, 16 Mar 2018 01:01:08 +0000 (01:01 +0000)]
Merge "Removes stats_log proto from uid map in statsd." into pi-dev
am:
bb75a991eb
Change-Id: Id34dd6c4955002b405fbd46c6d4b198a61700cd1
Wei Jia [Fri, 16 Mar 2018 00:55:06 +0000 (00:55 +0000)]
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev
am:
2d76c3ce82
Change-Id: Ib38e150756b7843774a6e6fe7c605739ae34a417
Kweku Adams [Fri, 16 Mar 2018 00:28:51 +0000 (00:28 +0000)]
Merge "Adding size suffix to diskstats fields." into pi-dev
am:
25300a1ff2
Change-Id: Ief93f4a7a8d2e6f03690e1d570d1c815ccc5c1c2
Chenjie Yu [Fri, 16 Mar 2018 00:22:01 +0000 (00:22 +0000)]
Merge "Fix uid for AppBreadcrumbReported for 3p app" into pi-dev
am:
a3178fc440
Change-Id: I681358bd056e92c0ecc18e8137bedd87e433b640
Chien-Yu Chen [Fri, 16 Mar 2018 00:17:19 +0000 (00:17 +0000)]
Merge "camera2: Add links for aeState" into pi-dev
am:
43a4dffd77
Change-Id: I0e60c01b6c4a03d4d23fa32265696059c1528f07
Yi Jin [Fri, 16 Mar 2018 00:13:22 +0000 (00:13 +0000)]
Merge "Remove comments of privacy.proto to avoid this accidently go to AOSP" into pi-dev
am:
d382087795
Change-Id: Iccd024c01edacf8043343910bb5dd68385be5fa6
Marco Nelissen [Fri, 16 Mar 2018 00:10:06 +0000 (00:10 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef am:
957e6ff8fe -s ours am:
10dd321343 -s ours am:
9dadab0c7c -s ours
am:
baf50ad211 -s ours
Change-Id: Ieca2a506db77fc43908d3a1fe00b8921c90fda69
Chong Zhang [Thu, 15 Mar 2018 23:59:11 +0000 (23:59 +0000)]
Merge "update OWNERS Bug:
63633199 Change-Id: I538ca012b68e27106fee8924f588a9fc1aef88f8" into pi-dev
am:
4985fdef8b
Change-Id: I8124ec5c50be404e0aacd6f05b09bf2ded586d28
Chong Zhang [Thu, 15 Mar 2018 23:50:57 +0000 (23:50 +0000)]
Merge "fix slow get caps -- DO NOT MERGE" into pi-dev
am:
991ae64ffe
Change-Id: I3e64414237c225881a0774e55efb295fe0f992dd
Treehugger Robot [Thu, 15 Mar 2018 23:50:49 +0000 (23:50 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
TreeHugger Robot [Thu, 15 Mar 2018 23:16:47 +0000 (23:16 +0000)]
Merge "[UI Tweak] Move PIN eSIM error message button position" into pi-dev
Leon Scroggins III [Thu, 15 Mar 2018 23:16:09 +0000 (23:16 +0000)]
Merge "Move computation of decodeColor- Type and Space" into pi-dev
am:
6d39e55020
Change-Id: I77430994b80387589d8fc35baaeb2748c5557dfa
Wyatt Riley [Thu, 15 Mar 2018 23:06:06 +0000 (23:06 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev am:
38860f2cab am:
4b8765ff4a
am:
3b0285794a
Change-Id: I401b79bd0df7cf4e3b423edd70806f2ed7b3d7ea
Yi Jin [Thu, 15 Mar 2018 23:05:46 +0000 (23:05 +0000)]
Merge "Fix bug to break switch cases." into pi-dev
am:
f3bf703025
Change-Id: Ib0cb77ccad99f434e1167d5bf4ef287931445ede
Beverly [Thu, 15 Mar 2018 23:00:57 +0000 (23:00 +0000)]
Merge "DndTile includes secondary label in content descr." into pi-dev
am:
edd7215f1c
Change-Id: Ifa5f67e89fe5dc0139cf63bd45d6727bc3aabc9b
TreeHugger Robot [Thu, 15 Mar 2018 22:57:09 +0000 (22:57 +0000)]
Merge "Removes stats_log proto from uid map in statsd." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 22:54:49 +0000 (22:54 +0000)]
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 22:52:39 +0000 (22:52 +0000)]
Merge "Adding size suffix to diskstats fields." into pi-dev
Chen Xu [Thu, 15 Mar 2018 22:49:17 +0000 (22:49 +0000)]
Merge "rename notifications from carrierServiceStateTracker" am:
6a7bb0694f
am:
abf9a4ccbd -s ours
Change-Id: I100f46c02a07b3b9d820e1859c884abc25225857
TreeHugger Robot [Thu, 15 Mar 2018 22:46:47 +0000 (22:46 +0000)]
Merge "Fix uid for AppBreadcrumbReported for 3p app" into pi-dev
Sunny Goyal [Thu, 15 Mar 2018 22:31:12 +0000 (22:31 +0000)]
Merge "Adding IntDef annotations to some flag based properties" into pi-dev
am:
2cc537a24c
Change-Id: Idae995717eb7b86292910789d3d2132239d25812
Wyatt Riley [Thu, 15 Mar 2018 22:27:50 +0000 (22:27 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev am:
38860f2cab
am:
4b8765ff4a
Change-Id: Ib91a39ae254922ae56b2911c29b86679d4dd16fb
TreeHugger Robot [Thu, 15 Mar 2018 22:17:22 +0000 (22:17 +0000)]
Merge "camera2: Add links for aeState" into pi-dev
Wyatt Riley [Thu, 15 Mar 2018 22:14:04 +0000 (22:14 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev
am:
38860f2cab
Change-Id: Ief795f6cc13f5877acf0550a144c7f16aaa9a934
Yi Jin [Thu, 15 Mar 2018 22:09:46 +0000 (22:09 +0000)]
Merge "Remove comments of privacy.proto to avoid this accidently go to AOSP" into pi-dev
Makoto Onuki [Thu, 15 Mar 2018 22:08:30 +0000 (22:08 +0000)]
Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
am:
70d24a0b1f
Change-Id: I5569896a94ba6d34cb75b83bacdf44ddc8a9ae28
Marco Nelissen [Thu, 15 Mar 2018 22:05:35 +0000 (22:05 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef am:
957e6ff8fe -s ours am:
10dd321343 -s ours
am:
9dadab0c7c -s ours
Change-Id: Id212aa1da51bd755ff548abb1067078e661ab674
Yi Jin [Tue, 13 Mar 2018 22:01:00 +0000 (15:01 -0700)]
Remove comments of privacy.proto to avoid this accidently go to AOSP
Bug:
72950747
Test: manual
Change-Id: I06a897170996fc0aa493bda76495c6ef1e484961
Felipe Leme [Thu, 15 Mar 2018 22:01:27 +0000 (22:01 +0000)]
Merge "Improved Field Classification edit distance algorithms." into pi-dev
am:
a46e4d1059
Change-Id: I56ea297783c0983b2a39fe4f0e0af7aa7410498a
Marco Nelissen [Thu, 15 Mar 2018 21:57:27 +0000 (21:57 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef am:
957e6ff8fe -s ours
am:
10dd321343 -s ours
Change-Id: I1b97c296b4e205f22eef83a34512bd16e8b6464a
Chen Xu [Thu, 15 Mar 2018 21:46:59 +0000 (21:46 +0000)]
Merge "rename notifications from carrierServiceStateTracker"
am:
6a7bb0694f
Change-Id: I2df44b61548efb65e872867b6feabec9da80e3a8
Chong Zhang [Thu, 15 Mar 2018 21:46:42 +0000 (21:46 +0000)]
Merge "update OWNERS Bug:
63633199 Change-Id: I538ca012b68e27106fee8924f588a9fc1aef88f8" into pi-dev
Chong Zhang [Thu, 15 Mar 2018 21:42:37 +0000 (14:42 -0700)]
update OWNERS
Bug:
63633199
Change-Id: I538ca012b68e27106fee8924f588a9fc1aef88f8
TreeHugger Robot [Thu, 15 Mar 2018 21:40:32 +0000 (21:40 +0000)]
Merge "fix slow get caps -- DO NOT MERGE" into pi-dev
Beverly [Thu, 15 Mar 2018 21:40:10 +0000 (21:40 +0000)]
Merge "Delete secondary text in charging animation" into pi-dev
am:
5f1fd6023f
Change-Id: I58b4f5caeb17348f16ab1c0e653094cef5546fb4
TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev
* changes:
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped:
3656457fac skipped:
d3ef137680
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped:
3656457fac
DO NOT MERGE: Restoring Network Available Notification to AGnssRil
Etan Cohen [Thu, 15 Mar 2018 21:34:19 +0000 (21:34 +0000)]
Merge "[AWARE] Metrics for Discovery + Ranging" into pi-dev
am:
cf8acd8a70
Change-Id: I32ffcd8839473e7cc0180a2b41111bdf2aba855c
Marco Nelissen [Thu, 15 Mar 2018 21:26:48 +0000 (21:26 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef
am:
957e6ff8fe -s ours
Change-Id: I0eed35a22a6e3186d8dc37fb2bae76fcbbe0d5ff
TreeHugger Robot [Thu, 15 Mar 2018 21:26:24 +0000 (21:26 +0000)]
Merge "Move computation of decodeColor- Type and Space" into pi-dev
Yi Jin [Thu, 15 Mar 2018 21:25:59 +0000 (21:25 +0000)]
Merge "Fix bug to break switch cases." into pi-dev
Yi Jin [Thu, 15 Mar 2018 21:14:26 +0000 (14:14 -0700)]
Fix bug to break switch cases.
Bug:
75001195
Test: N/A
Change-Id: I99274cbf34d191c25ad9ced08f999c59f922cb25
David Brazdil [Thu, 15 Mar 2018 21:17:28 +0000 (21:17 +0000)]
Merge "Add uses on marlin to hidden API light greylist" into pi-dev
am:
098547a92c
Change-Id: I653e27561c3e7ca7ec43188ef3251a31a5b6d2c4
Mike Digman [Thu, 15 Mar 2018 21:11:35 +0000 (21:11 +0000)]
Merge "Add rotation logs to help debug bug reports" into pi-dev
am:
51625184b7
Change-Id: I33b1304b23c99c91fdfa93070b10ebc066f408fe
TreeHugger Robot [Thu, 15 Mar 2018 21:10:21 +0000 (21:10 +0000)]
Merge "DndTile includes secondary label in content descr." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 21:07:13 +0000 (21:07 +0000)]
Merge "Adding IntDef annotations to some flag based properties" into pi-dev
Mike Digman [Thu, 15 Mar 2018 21:03:46 +0000 (21:03 +0000)]
Merge "Update rotate navbar icon to Google Material spec" into pi-dev
am:
b96b6bbdfc
Change-Id: Icd1a5b9b9a2f0241db7d1298b828bbf5d2f93686
Makoto Onuki [Thu, 15 Mar 2018 21:01:49 +0000 (21:01 +0000)]
Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
Jack Yu [Thu, 15 Mar 2018 20:53:38 +0000 (20:53 +0000)]
Merge "Fixed data connection state callback not working" am:
28d076b829
am:
3aea6031b6 -s ours
Change-Id: Ia98fabfa46b31f6db379b83101e4a93c01b2cff2
TreeHugger Robot [Thu, 15 Mar 2018 20:52:09 +0000 (20:52 +0000)]
Merge "Improved Field Classification edit distance algorithms." into pi-dev
Kweku Adams [Thu, 15 Mar 2018 18:29:42 +0000 (11:29 -0700)]
Adding size suffix to diskstats fields.
This is to follow the stated style convention.
Bug:
74975371
Test: flash device and check incident output
Change-Id: Ic4282f2e623999f4d7795c4932d5faf10280c3c6
Jack Yu [Thu, 15 Mar 2018 20:39:46 +0000 (20:39 +0000)]
Merge "Fixed data connection state callback not working"
am:
28d076b829
Change-Id: If14c65c653f9665941985a71a60310cad2395265
Alan Viverette [Thu, 15 Mar 2018 20:37:54 +0000 (20:37 +0000)]
Merge "Revert "Update packages for 1.0.0-beta1"" into pi-dev
am:
5b07f94a95
Change-Id: I567113f4f1a3506fb18588717b7bfd71cbc6ecb0
David Chen [Thu, 15 Mar 2018 01:36:45 +0000 (18:36 -0700)]
Removes stats_log proto from uid map in statsd.
We don't need to parse the proto of uid map, so we use the
ProtoOutputStreame class to generate the binary form of the proto
output that's needed for parsing the uid map data.
Test: Verified unit-tests still pass.
Bug:
74010813
Change-Id: Ia2f7572f3b78bb6f7b60e8b14cf5d65428469ab6
TreeHugger Robot [Thu, 15 Mar 2018 20:32:27 +0000 (20:32 +0000)]
Merge "Delete secondary text in charging animation" into pi-dev
Etan Cohen [Thu, 15 Mar 2018 20:26:13 +0000 (20:26 +0000)]
Merge "[AWARE] Metrics for Discovery + Ranging" into pi-dev
Svet Ganov [Thu, 15 Mar 2018 20:22:12 +0000 (20:22 +0000)]
Merge "Don't throw but wtf to help chase mismatched start/finish op calls" into pi-dev
am:
2cd6ce5e35
Change-Id: I5ce3834f3409a2b7592e49789e0f74b7ad53633d
Chen Xu [Thu, 15 Mar 2018 20:19:48 +0000 (20:19 +0000)]
Merge "rename notifications from carrierServiceStateTracker"
John Reck [Thu, 15 Mar 2018 20:15:17 +0000 (20:15 +0000)]
Merge "Break down jank between frame drops vs. triple buffered" into pi-dev
am:
613783a909
Change-Id: Id427d21419159c464c96636e6b5fd05f90fae46c
TreeHugger Robot [Thu, 15 Mar 2018 20:11:37 +0000 (20:11 +0000)]
Merge "Add uses on marlin to hidden API light greylist" into pi-dev
Mike Digman [Thu, 15 Mar 2018 20:06:53 +0000 (20:06 +0000)]
Merge "Add rotation logs to help debug bug reports" into pi-dev
Mike Digman [Thu, 15 Mar 2018 20:06:19 +0000 (20:06 +0000)]
Merge "Update rotate navbar icon to Google Material spec" into pi-dev
Antoan Angelov [Thu, 15 Mar 2018 20:05:50 +0000 (20:05 +0000)]
Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev
am:
675db3f236
Change-Id: I933134e5741cf264f38641629705a234175b90c7
Alan Viverette [Thu, 15 Mar 2018 20:04:22 +0000 (20:04 +0000)]
Merge "Revert "Update packages for 1.0.0-beta1"" into pi-dev
Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:14 +0000 (20:00 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef
Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f
Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:09 +0000 (20:00 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855
Change-Id: Ia2f661ae02c925da5d6e05f96983cc3f606cd9bd
Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:04 +0000 (20:00 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2
Change-Id: I6388ec63ab6d29d1b002cc296571e67278245fc0
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:59 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f
Change-Id: I3a801f0e6cadeb98e28d91c52062e6e63164bca2
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:54 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d
Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:42 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca
Change-Id: Ib29c785708e959391b3e388b453147e94037420f
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923
Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:32 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644
Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:26 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38
Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608
Chenjie Yu [Thu, 15 Mar 2018 19:59:19 +0000 (19:59 +0000)]
Merge "Improve efficiency for CpuTimePerUidFreq" into pi-dev
am:
d4803600d3
Change-Id: Iad3b9ee4dcca61a3afd6c4211f7f352f6b572e83
Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]
DO NOT MERGE Rework thumbnail cleanup
Bug:
63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
TreeHugger Robot [Thu, 15 Mar 2018 19:56:39 +0000 (19:56 +0000)]
Merge "Don't throw but wtf to help chase mismatched start/finish op calls" into pi-dev
John Reck [Thu, 15 Mar 2018 19:48:54 +0000 (19:48 +0000)]
Merge "Break down jank between frame drops vs. triple buffered" into pi-dev
Todd Kennedy [Thu, 15 Mar 2018 19:44:34 +0000 (19:44 +0000)]
Merge "Fix instant app filter" into pi-dev
am:
bef1457d49
Change-Id: I564bf59fae9f3d407ef08cd591a003daa2e628f0
Antoan Angelov [Thu, 15 Mar 2018 19:40:13 +0000 (19:40 +0000)]
Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 19:39:03 +0000 (19:39 +0000)]
Merge "Improve efficiency for CpuTimePerUidFreq" into pi-dev
Todd Kennedy [Thu, 15 Mar 2018 19:28:33 +0000 (19:28 +0000)]
Merge "Fix instant app filter" into pi-dev
Todd Kennedy [Wed, 14 Mar 2018 15:14:23 +0000 (08:14 -0700)]
Fix instant app filter
There were two bugs in the filtration:
1) An instant app could query for activity info in another
instant app
2) An instant app could query for activity info from a full
app if the activity was implicitly exposed by having
a VIEW/BROWSABLE intent filter
Fixes:
74986543
Test: atest -it CtsAppSecurityHostTestCases:EphemeralTest#testActivityInfo
Change-Id: I89b2fb661b13b8e8a8abc6f980d9c56eb4d692b7
(cherry picked from commit
9c72a974224a931f093cdba59abc8627570b3aeb)
Treehugger Robot [Thu, 15 Mar 2018 19:04:30 +0000 (19:04 +0000)]
Merge "Fixed data connection state callback not working"
Sunny Goyal [Thu, 15 Mar 2018 19:00:26 +0000 (12:00 -0700)]
Adding IntDef annotations to some flag based properties
Bug:
74408961
Test: N/A
Change-Id: I4320c5e265b52338eb2f4b2e5ea80ea05b9ca28f
Sundeep Ghuman [Thu, 15 Mar 2018 18:51:32 +0000 (18:51 +0000)]
Merge "Add fake plan with data overuse." into pi-dev
am:
6c1f339470
Change-Id: I10248f2fb36dbdcb8762b07ec5a196d4500defdb
Beverly [Thu, 15 Mar 2018 18:50:40 +0000 (14:50 -0400)]
DndTile includes secondary label in content descr.
On talkback, user will be able to hear the secondary label
for DND now.
Test: manual
Change-Id: Iaef1e568d8b5f466f0b2352cf648fb43ef1bc64a
Fixes:
74946051
fionaxu [Thu, 15 Mar 2018 01:33:47 +0000 (18:33 -0700)]
rename notifications from carrierServiceStateTracker
Bug:
37578776
Bug:
72712198
Test: Manual
Change-Id: Ifcf670c03f3777e08f03c1a4f0c3f3d6092192b2
(cherry picked from commit
8683f651388ebc4ba063f6e21afb8ceff23c58a0)
Merged-in: Ifcf670c03f3777e08f03c1a4f0c3f3d6092192b2
Alan Viverette [Thu, 15 Mar 2018 17:47:57 +0000 (17:47 +0000)]
Revert "Update packages for 1.0.0-beta1"
This reverts commit
ad4d866837be4ed07d44672d74473acfb9461ec2.
Reason for revert: broke Settings
Bug:
74950017
Test: revert only
Change-Id: I7a535717d30ec79cd5a2f0529cb7ce511145e0ae
TreeHugger Robot [Thu, 15 Mar 2018 18:34:54 +0000 (18:34 +0000)]
Merge "Add fake plan with data overuse." into pi-dev
Felipe Leme [Thu, 15 Mar 2018 00:23:28 +0000 (17:23 -0700)]
Improved Field Classification edit distance algorithms.
The initial implementation was very simple, as the focus was the overall
workflow. Now it uses a proper implementation, copied from
com.android.tools.lint.detector.api.LintUtils.java
Test: atest ExtServicesUnitTests FieldsClassificationTest
Bug:
70291841
Change-Id: I7424b7f03a3c9cf9619c154656fa211b9f0c494a
Android Build Merger (Role) [Thu, 15 Mar 2018 18:27:26 +0000 (18:27 +0000)]
Merge "Merge "Amend package whitelist." am:
e70b94815a am:
bf0e1d6699" into pi-dev-plus-aosp
Mathew Inwood [Thu, 15 Mar 2018 18:26:59 +0000 (18:26 +0000)]
Merge "Amend package whitelist." am:
e70b94815a
am:
bf0e1d6699
Change-Id: I331226e0d11ebf8d404e1cd361dd577b7d5fb247
Wei Jia [Thu, 15 Mar 2018 18:26:37 +0000 (11:26 -0700)]
MediaPlayer2Impl: fix null object reference.
Test: cts tests pass
Bug:
74204684
Change-Id: I906eeb9d907ae1a798be585c54126f02eb66448f
Chen Xu [Thu, 15 Mar 2018 18:24:42 +0000 (18:24 +0000)]
Merge "rename notifications from carrierServiceStateTracker" into pi-dev
am:
053f492111
Change-Id: Ie018c26b96481be46ba84253b3857228a60362b5
Robert Berry [Thu, 15 Mar 2018 18:18:51 +0000 (18:18 +0000)]
Merge "Delete unused RecoveryController exceptions" into pi-dev
am:
2f9f567114
Change-Id: I6a03163e8fde1f254f1f7b9cdaecb07f53bd074e
Chong Zhang [Thu, 1 Mar 2018 02:46:26 +0000 (18:46 -0800)]
fix slow get caps -- DO NOT MERGE
When get caps is called on an MediaCodec object, try to
use the codec info for that MediaCodec first as it should
be available during codec construction. Only when that
somehow failed go and initialize the full MediaCodecList,
as building the entire list could be very slow.
And when cloning the CodecCapabilities from MediaCodecInfo,
copy the fields directly and the fields (other than the ones
modifiable by client) are immutable after construction.
bug:
74073607
Test:
CTS media post submit:
cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice
Change-Id: I4ae5f2431da8528e1eca093c5cfb98abcb4a5bbf
(cherry picked from commit
90d7304a83ea1758ac2f7a9293d4790a1a28eb4e)
Mathew Inwood [Thu, 15 Mar 2018 18:16:57 +0000 (18:16 +0000)]
Merge "Amend package whitelist."
am:
e70b94815a
Change-Id: Id1ba1faec336422406c47848790180173a12b3c6
OSDN Git Service
