OSDN Git Service
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
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
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
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)
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
TreeHugger Robot [Thu, 15 Mar 2018 18:34:54 +0000 (18:34 +0000)]
Merge "Add fake plan with data overuse." into pi-dev
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
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
Mathew Inwood [Thu, 15 Mar 2018 18:16:57 +0000 (18:16 +0000)]
Merge "Amend package whitelist."
am:
e70b94815a
Change-Id: Id1ba1faec336422406c47848790180173a12b3c6
Jorim Jaggi [Thu, 15 Mar 2018 18:10:58 +0000 (18:10 +0000)]
Merge "Mark flaky test as flaky" into pi-dev
am:
847e37d84d
Change-Id: I0392e17d111340c6f8648d2ebf19bf1a1ca83413
Andrew Solovay [Thu, 15 Mar 2018 18:02:38 +0000 (18:02 +0000)]
Merge "docs: Fixing broken hyperlinks" into pi-dev
am:
bf190fd964
Change-Id: I64a73a8675a455cbf74ea1864da1940abb73cc15
Chen Xu [Thu, 15 Mar 2018 18:01:02 +0000 (18:01 +0000)]
Merge "rename notifications from carrierServiceStateTracker" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 17:59:07 +0000 (17:59 +0000)]
Merge "Delete unused RecoveryController exceptions" into pi-dev
Stan Iliev [Thu, 15 Mar 2018 17:55:42 +0000 (17:55 +0000)]
Merge "kClear blend mode is drawn as kDstOut" into pi-dev
am:
654f766726
Change-Id: I6cc7dd7992400ed5f9ad9e6bf9623b5c7e7ccf63
Jorim Jaggi [Thu, 15 Mar 2018 17:50:38 +0000 (17:50 +0000)]
Merge "Mark flaky test as flaky" into pi-dev
Yi Jin [Thu, 15 Mar 2018 17:48:42 +0000 (17:48 +0000)]
Merge "Wrap fd with unique_fd so it won't leak." into pi-dev
am:
ddf057416f
Change-Id: I7f2a07f65b922aed92bcf3242501db2caf901d20
Andrew Solovay [Thu, 15 Mar 2018 17:40:55 +0000 (17:40 +0000)]
Merge "docs: Fixing broken hyperlinks" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 17:36:12 +0000 (17:36 +0000)]
Merge "kClear blend mode is drawn as kDstOut" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 17:32:22 +0000 (17:32 +0000)]
Merge "Wrap fd with unique_fd so it won't leak." into pi-dev
Chenjie Yu [Thu, 15 Mar 2018 00:12:59 +0000 (17:12 -0700)]
Improve efficiency for CpuTimePerUidFreq
Tested on marlin. Shortly after boot, the total is 468 fileds with non
zero time spent at frequency.
It quickly swell to 1600+ though.
It is some improvement compared to 2700+, but still an extremely large
pulled atom.
Bug:
74965273
Test: manual test
Change-Id: Ibbeaa02f54d91c4958d75dd3aaafbb306d61f8d8
Andreas Gampe [Thu, 15 Mar 2018 17:19:06 +0000 (17:19 +0000)]
Merge "Frameworks: Fix system server profiling" am:
eed99d8629
am:
e8d1374024
Change-Id: I228f91fb48566f541bfd8a84be71968b13992e2d
Andreas Gampe [Thu, 15 Mar 2018 17:10:15 +0000 (17:10 +0000)]
Merge "Frameworks: Fix system server profiling"
am:
eed99d8629
Change-Id: Ia07782e694d066f827e99fffa49c93321444b851
Treehugger Robot [Thu, 15 Mar 2018 16:42:10 +0000 (16:42 +0000)]
Merge "Amend package whitelist."
Wei Jia [Thu, 15 Mar 2018 15:50:12 +0000 (15:50 +0000)]
Merge "MediaPlayer2Impl: fix several functions" into pi-dev
am:
50f118a121
Change-Id: I66aebceb65dc87dce7a7d262ae748a2f73132773
TreeHugger Robot [Thu, 15 Mar 2018 15:40:10 +0000 (15:40 +0000)]
Merge "MediaPlayer2Impl: fix several functions" into pi-dev
Treehugger Robot [Thu, 15 Mar 2018 15:36:28 +0000 (15:36 +0000)]
Merge "Frameworks: Fix system server profiling"
Julia Reynolds [Thu, 15 Mar 2018 15:28:57 +0000 (15:28 +0000)]
Merge "Fix occasional NPE" into pi-dev
am:
d2f757bdd9
Change-Id: Ib0ecd63c2752cbe7fe2464ea98268dda462d864b
Stan Iliev [Fri, 2 Mar 2018 18:20:26 +0000 (13:20 -0500)]
kClear blend mode is drawn as kDstOut
kClear blend mode is drawn as kDstOut on hardware canvas for
compatibility with Android O and older.
On SDK released with Android P, the kClear blend mode is respected.
Bug:
71602378
Test: Ran Flo app
Change-Id: I6b0fa8b8bf5aa14aa5a351a914bf2ed0469ac660
(cherry picked from commit
f9a461feafded09a0949f5acfd42187dc857a823)
Adrian Roos [Thu, 15 Mar 2018 15:17:48 +0000 (15:17 +0000)]
Merge "Display Cutout: invalidate overlay view when cutout changes" into pi-dev
am:
f30b7ef753
Change-Id: I2129636c16a66135dd6aff4e5584e56dabb858ed
TreeHugger Robot [Thu, 15 Mar 2018 15:10:49 +0000 (15:10 +0000)]
Merge "Fix occasional NPE" into pi-dev
Nicolas Geoffray [Thu, 15 Mar 2018 15:10:15 +0000 (15:10 +0000)]
Merge "Add new hidden API." into pi-dev
am:
cd0a1d1c8d
Change-Id: Ibbca12baba65bc48fea11b441ef56b584e73e5bb
Adrian Roos [Thu, 15 Mar 2018 15:02:24 +0000 (15:02 +0000)]
Merge "Display Cutout: invalidate overlay view when cutout changes" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 14:52:26 +0000 (14:52 +0000)]
Merge "Add new hidden API." into pi-dev
Julien Desprez [Thu, 15 Mar 2018 14:46:07 +0000 (14:46 +0000)]
Merge "Update a bunch of AndroidTest for apct suite" into pi-dev
am:
a9c279141a
Change-Id: Iae6f14fd70ffae567534ab3df4bf76fb6d8531ab
Robert Berry [Thu, 15 Mar 2018 14:34:16 +0000 (14:34 +0000)]
Delete unused RecoveryController exceptions
These were never used by GMSCore, so can safely be deleted.
Bug:
74944591
Test: it builds
Change-Id: Ib8955262223aa5d86de0b342f6e04c7461c71583
Julien Desprez [Thu, 15 Mar 2018 14:29:11 +0000 (14:29 +0000)]
Merge "Update a bunch of AndroidTest for apct suite" into pi-dev
Mathew Inwood [Thu, 15 Mar 2018 14:05:53 +0000 (14:05 +0000)]
Amend package whitelist.
Now that Antons cleanup of all packages is complete, we can generate this
whitelist from those packages that specify
LOCAL_PRIVATE_PLATFORM_APIS := true
This is the resulting list of packages. This change also includes fixes to
the method; previously, packges that didn't specify any certificate may
have been exluded.
Test: Verify that device boots.
Change-Id: I1f578322135274b80708d4bb7664f7732ac33cc7
Alan Viverette [Thu, 15 Mar 2018 13:59:12 +0000 (13:59 +0000)]
Merge "Update packages for 1.0.0-beta1" into pi-dev
am:
a88c9b558f
Change-Id: I602da6356d0523d7e3164026eb23e75160462a53
Yohei Yukawa [Thu, 15 Mar 2018 13:44:41 +0000 (13:44 +0000)]
Merge "Add IMS#BACK_DISPOSITION_ADJUST_NOTHING" into pi-dev
am:
feff6c7d41
Change-Id: I9c1c00c5903810dde7779958c97e3e0e12e135ab
Alan Viverette [Thu, 15 Mar 2018 13:32:16 +0000 (13:32 +0000)]
Merge "Update packages for 1.0.0-beta1" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 13:27:30 +0000 (13:27 +0000)]
Merge "Add IMS#BACK_DISPOSITION_ADJUST_NOTHING" into pi-dev
David Brazdil [Thu, 15 Mar 2018 13:13:00 +0000 (13:13 +0000)]
Merge "Greylist DevicePolicyManager#setDefaultSmsApplication" into pi-dev
am:
d06f1a748e
Change-Id: I4cd2c66e1f1cb48479864fb9b73244e607595e28
David Brazdil [Thu, 15 Mar 2018 13:06:15 +0000 (13:06 +0000)]
Merge "Greylist DevicePolicyManager#setDefaultSmsApplication" into pi-dev
Jaewan Kim [Thu, 15 Mar 2018 13:06:15 +0000 (13:06 +0000)]
Merge "Add jaewan@ to OWNERS" into pi-dev
am:
85ff9c3d64
Change-Id: I699799d1042694463072ee1585d086cc26fc4449
Artem Iglikov [Thu, 15 Mar 2018 13:01:46 +0000 (13:01 +0000)]
Merge "Whitelist UsbPortStatus and UsbRequest members" into pi-dev
am:
e1fde42407
Change-Id: I709648984bb458352451fc8f290512305339fb88
Nicolas Geoffray [Thu, 15 Mar 2018 12:49:11 +0000 (12:49 +0000)]
Add new hidden API.
bug:
74938974
Test: m
Change-Id: Idc2f9c9f707ef813c792764334ec124583e4ca33
Jaewan Kim [Thu, 15 Mar 2018 12:43:29 +0000 (12:43 +0000)]
Merge "Add jaewan@ to OWNERS" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 12:41:17 +0000 (12:41 +0000)]
Merge "Whitelist UsbPortStatus and UsbRequest members" into pi-dev
Julia Reynolds [Wed, 14 Mar 2018 17:48:39 +0000 (13:48 -0400)]
Fix occasional NPE
Change-Id: Ia815d2160b1860b2f10a5d30019d03d1ee777fe8
Fixes:
73558046
Test: none
Primiano Tucci [Thu, 15 Mar 2018 12:37:31 +0000 (12:37 +0000)]
Merge "perfetto: Add setting to enable/disable traced" into pi-dev
am:
d4b6c8c162
Change-Id: I8a36e7f72a462f963152dd0173661191ab99a24a
Primiano Tucci [Thu, 15 Mar 2018 12:24:02 +0000 (12:24 +0000)]
Merge "perfetto: Add setting to enable/disable traced" into pi-dev
Hector Dearman [Wed, 7 Mar 2018 11:12:35 +0000 (11:12 +0000)]
perfetto: Add setting to enable/disable traced
This will help us run P/H experiments by controlling the
whether traced runs through P/H.
This will allow to gradually roll out traced and, in an
emergency, remotely disable it.
Run:
$ adb shell 'ps -A | grep traced'
Should see traced.
$ adb shell 'settings put global sys_traced 0'
$ adb shell 'ps -A | grep traced'
Should no longer see traced.
Test: See above.
Bug: b/
71737179
Bug: b/
74383547
Change-Id: I1f564421d9abae14d7d80769e9517eb363dae33a
Merged-In: I1f564421d9abae14d7d80769e9517eb363dae33a
Nicolas Geoffray [Thu, 15 Mar 2018 12:01:48 +0000 (12:01 +0000)]
Merge "Add new APIs." into pi-dev
am:
216469c7d8
Change-Id: If505f1fd439b2e83dc88d7db7c680284b709e15c
Jorim Jaggi [Thu, 15 Mar 2018 11:58:49 +0000 (12:58 +0100)]
Mark flaky test as flaky
Flakyness seems to be around 1%.
Bug:
74780584
Change-Id: Ie0abdb19d626a1a209d58805401b702d563b9cef
Nicolas Geoffray [Thu, 15 Mar 2018 11:53:14 +0000 (11:53 +0000)]
Merge "Add new APIs." into pi-dev
Artem Iglikov [Thu, 15 Mar 2018 10:47:26 +0000 (10:47 +0000)]
Whitelist UsbPortStatus and UsbRequest members
Bug:
74424953
Test: N/A
Change-Id: Idf0c71c16bb7d3747e00b357a88e03a27c10e9d6
Jaewan Kim [Thu, 15 Mar 2018 10:35:31 +0000 (10:35 +0000)]
Merge "MediaSession2: Implement skipTo APIs" into pi-dev
am:
a01d80b97e
Change-Id: I5af9fec0700becc1ba6c1b1d119e7ef638e2db37
Michal Karpinski [Thu, 15 Mar 2018 10:29:22 +0000 (10:29 +0000)]
Merge "Allow restoring of apps that rotated key" into pi-dev
am:
d766e212c9
Change-Id: I974f193fc7e096598f0c49c0199715d75a41c8df
Jaewan Kim [Thu, 15 Mar 2018 10:15:07 +0000 (10:15 +0000)]
Merge "MediaSession2: Implement skipTo APIs" into pi-dev
Michal Karpinski [Thu, 15 Mar 2018 10:13:34 +0000 (10:13 +0000)]
Merge "Allow restoring of apps that rotated key" into pi-dev
Nicolas Geoffray [Wed, 14 Mar 2018 17:39:58 +0000 (17:39 +0000)]
Add new APIs.
bug:
64382372
Test: m
Change-Id: I6be84f5d5062737dcdd51c60be5196ac2a2a5c4b
Jaewan Kim [Thu, 15 Mar 2018 07:49:40 +0000 (16:49 +0900)]
Add jaewan@ to OWNERS
Bug:
74897795
Test: N/A
Change-Id: I5cf110bd6f99b20f5ed2fc5d2ccdba318b0d99f8
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
Jaewan Kim [Tue, 13 Mar 2018 06:48:36 +0000 (15:48 +0900)]
MediaSession2: Implement skipTo APIs
This implements following APIs from both session and controller.
- skipToPlaylistItem()
- skipToNextItem()
- skipToPreviousItem()
Bug:
74175632
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I47d94346c997314ff39797bac3034aa507058036
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
Sundeep Ghuman [Thu, 15 Mar 2018 06:20:23 +0000 (23:20 -0700)]
Add fake plan with data overuse.
Bug:
70950124
Test: 1. adb shell setprop fw.fake_plan month_over
2. Visit data usage page
Change-Id: I44b474c8a668ca15eca733878057ab0931c349b1
Andreas Gampe [Thu, 15 Mar 2018 06:13:28 +0000 (23:13 -0700)]
Frameworks: Fix system server profiling
Avoid a race to close the profiling file descriptor.
Bug:
74883338
Test: m
Test: am profile start `pid system_server` /data/local/tmp/test.trace && sleep 5s && am profile stop `pid system_server` && adb pull /data/local/tmp/test.trace && [[ $(find test.trace -size +1K) ]] && echo Success
Change-Id: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
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
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
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