OSDN Git Service
Yin-Chia Yeh [Thu, 15 Mar 2018 18:28:20 +0000 (11:28 -0700)]
Camera: update tonemap image in html doc
Bug:
74942037
Change-Id: I6ac4bd9e7a6d9bb2b8e3d1303656c0cdc525178b
Richard Ledley [Tue, 6 Mar 2018 17:36:55 +0000 (17:36 +0000)]
Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities."
TreeHugger Robot [Tue, 6 Mar 2018 17:15:02 +0000 (17:15 +0000)]
Merge "Atom: ResourceConfigurationChanged"
David Brazdil [Tue, 6 Mar 2018 16:24:02 +0000 (16:24 +0000)]
Merge "Add new APIs to hidden API light greylist" into pi-dev am:
e84c506fc3
am:
a924359e88
Change-Id: Ia6eb3722d940f3b00dc4e4b6f94aa56e84003975
Tony Mak [Tue, 6 Mar 2018 16:14:12 +0000 (16:14 +0000)]
Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev am:
bf8137a7cd
am:
6a6e20a432
Change-Id: I56677f1eac63fa2c9f97870808c2afd47c6da9a2
David Brazdil [Tue, 6 Mar 2018 15:57:48 +0000 (15:57 +0000)]
Merge "Add new APIs to hidden API light greylist" into pi-dev
am:
e84c506fc3
Change-Id: Ib8a1af76f3f94fb74fdf4b86554b711d928fb6a2
Tony Mak [Tue, 6 Mar 2018 15:46:32 +0000 (15:46 +0000)]
Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev
am:
bf8137a7cd
Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32
TreeHugger Robot [Tue, 6 Mar 2018 15:42:52 +0000 (15:42 +0000)]
Merge "Add new APIs to hidden API light greylist" into pi-dev
Mathew Inwood [Tue, 6 Mar 2018 15:39:37 +0000 (15:39 +0000)]
Fix dark greylist violation seen during walleye boot. am:
2cf621f8fa
am:
88aa87a1e7
Change-Id: I09c037ccaea0cb1c9f73c6c6802aeb248dfc96bf
TreeHugger Robot [Tue, 6 Mar 2018 15:23:18 +0000 (15:23 +0000)]
Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev
Mathew Inwood [Tue, 6 Mar 2018 15:22:10 +0000 (15:22 +0000)]
Fix dark greylist violation seen during walleye boot.
am:
2cf621f8fa
Change-Id: I7bdd12ed40b4c336ed4a00433f2179a39a342d80
TreeHugger Robot [Tue, 6 Mar 2018 14:43:35 +0000 (14:43 +0000)]
Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion""
David Brazdil [Tue, 6 Mar 2018 10:08:45 +0000 (10:08 +0000)]
Add new APIs to hidden API light greylist
More APIs seen in use by common apps.
Bug:
64382372
Bug:
74219651
Bug:
74198691
Bug:
74138451
Bug:
73848080
Bug:
74208493
Bug:
74212462
Test: make
Change-Id: Ia06a5116d84a5401546970234432cbeec27febb9
Mathew Inwood [Tue, 6 Mar 2018 11:47:31 +0000 (11:47 +0000)]
Fix dark greylist violation seen during walleye boot.
Add these members to the light greylist. Also ensure all existing items
are sorted.
Violations seen per package:
.dataservices:
Landroid/os/HwBlob;-><init>(I)V
com.google.android.gms:
Landroid/app/usage/UsageStatsManager;->getAppStandbyBucket(Ljava/lang/String;)I
Landroid/os/WorkSource;->createWorkChain()Landroid/os/WorkSource$WorkChain;
Landroid/os/WorkSource$WorkChain;->addNode(ILjava/lang/String;)Landroid/os/WorkSource$WorkChain;
Landroid/security/keystore/RecoveryController;->getInstance()Landroid/security/keystore/RecoveryController;
Landroid/security/keystore/RecoveryController;->initRecoveryService(Ljava/lang/String;[B)V
Landroid/security/keystore/RecoveryController;->setRecoverySecretTypes([I)V
Landroid/security/keystore/RecoveryController;->setServerParams([B)V
Landroid/security/keystore/RecoveryController;->setSnapshotCreatedPendingIntent(Landroid/app/PendingIntent;)V
com.google.android.gms.persistent:
Landroid/app/usage/UsageStatsManager;->getAppStandbyBucket(Ljava/lang/String;)I
Landroid/os/WorkSource;->createWorkChain()Landroid/os/WorkSource$WorkChain;
Landroid/os/WorkSource$WorkChain;->addNode(ILjava/lang/String;)Landroid/os/WorkSource$WorkChain;
com.google.intelligence.sense:
Landroid/media/soundtrigger/SoundTriggerManager;->stopRecognition(Ljava/util/UUID;)I
Landroid/media/soundtrigger/SoundTriggerManager;->unloadSoundModel(Ljava/util/UUID;)I
com.verizon.mips.services:
Landroid/util/NtpTrustedTime;->forceRefresh()Z
Landroid/util/NtpTrustedTime;->getCachedNtpTime()J
Landroid/util/NtpTrustedTime;->getCachedNtpTimeReference()J
Landroid/util/NtpTrustedTime;->getInstance(Landroid/content/Context;)Landroid/util/NtpTrustedTime;
Landroid/util/NtpTrustedTime;->hasCache()Z
Test: No more dark greylist violations seen during boot.
Change-Id: I1b5a51da5f08c86b3b5a4816f528db0ff41f6600
Mathew Inwood [Tue, 6 Mar 2018 12:23:00 +0000 (12:23 +0000)]
Merge "Don't whitelist all system image apps." into pi-dev am:
3fbc54e609
am:
a9c56d53e6
Change-Id: Ib2efa8d7d72933aa44bf18f9aacbead841545918
Mathew Inwood [Tue, 6 Mar 2018 12:07:30 +0000 (12:07 +0000)]
Merge "Don't whitelist all system image apps." into pi-dev
am:
3fbc54e609
Change-Id: I6eef88e7080c8c599494448b640ba0284cb30f6d
TreeHugger Robot [Tue, 6 Mar 2018 11:50:23 +0000 (11:50 +0000)]
Merge "Don't whitelist all system image apps." into pi-dev
Tony Mak [Tue, 6 Mar 2018 11:33:55 +0000 (11:33 +0000)]
Revert accidental change of isUsingUnifiedPassword javadoc
Test: None
Change-Id: I72735b790ae37838917b2330b84a3cfef32ce7b8
Android Build Merger (Role) [Tue, 6 Mar 2018 11:31:38 +0000 (11:31 +0000)]
Merge "Merge "MediaSession2: Update Builder" into pi-dev am:
9bc5610869 am:
899db63dbd"
Hyundo Moon [Tue, 6 Mar 2018 11:30:18 +0000 (11:30 +0000)]
Merge "MediaSession2: Update Builder" into pi-dev am:
9bc5610869
am:
899db63dbd
Change-Id: I6b0183a8b8dbca90d3cc727faa4e20bb555d1699
Bernardo Rufino [Tue, 6 Mar 2018 11:28:52 +0000 (11:28 +0000)]
Merge "More tests for PerformBackupTask"
Android Build Merger (Role) [Tue, 6 Mar 2018 11:11:54 +0000 (11:11 +0000)]
Merge "Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev am:
27ed96bf0c am:
f3e9ee6587"
Pete Gillin [Tue, 6 Mar 2018 11:08:56 +0000 (11:08 +0000)]
Merge "Add new 'explicit GC' policy to StrictMode."
Insun Kang [Tue, 6 Mar 2018 11:08:31 +0000 (11:08 +0000)]
Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev am:
27ed96bf0c
am:
f3e9ee6587
Change-Id: Ife355045483133acffe82b1371bf5a968167d3a5
Mike Ma [Tue, 6 Mar 2018 10:24:41 +0000 (10:24 +0000)]
Merge "Power profile audio & video support" into pi-dev am:
1ab03020db
am:
eece6eb9df
Change-Id: I53ea0a6f2453f56f18848638d07ef5194973824c
Erik Kline [Tue, 6 Mar 2018 10:18:18 +0000 (10:18 +0000)]
Merge "Fail if the interface is not available when starting" into pi-dev am:
a69df717ce -s ours
am:
fa17ec794a -s ours
Change-Id: I7aaf07a6cb2633a1c1be46ed51f6ae772a17ec80
Matthew Ng [Tue, 6 Mar 2018 10:09:08 +0000 (10:09 +0000)]
Merge "Shows the correct home icon when quickstep is enabled on startup" into pi-dev am:
a2546208a6
am:
802227b8b8
Change-Id: Ie85ada44ce62dbc452704e8f724a19d79797f73d
Wei Jia [Tue, 6 Mar 2018 10:03:29 +0000 (10:03 +0000)]
Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev am:
97d579d1ee
am:
3a4a27cf4c
Change-Id: Ic95343af3d1e190e2ad71ce31e0f616d86416e29
Mathew Inwood [Fri, 23 Feb 2018 15:01:52 +0000 (15:01 +0000)]
Don't whitelist all system image apps.
Also include in system dump which packages are exempt from the api
restrictions.
This is a cherry-pick of
974290b032b4d98603925d36851422986a5d7d0e
from master.
Test: Verified that the device boots.
Bug:
64382372
Change-Id: Iaeca91478f53c8b4e9608246aab42bdb90f899bb
Jack He [Tue, 6 Mar 2018 09:54:23 +0000 (09:54 +0000)]
Merge "Bluetooth: Use enums for adapter connection states" into pi-dev am:
faf6589748
am:
044a2e7476
Change-Id: I1c65ae6c38bc28385ceffe6931fce68e93b928f1
Lorenzo Colitti [Tue, 6 Mar 2018 09:47:26 +0000 (09:47 +0000)]
Merge "Merge "Minor cleanups to NetworkStats interface tracking." am:
6455e31b76 am:
65777e4b61" into pi-dev-plus-aosp
am:
9d9c884031
Change-Id: I37dcab7f7e915d27b87291120a198dbcf1421f8f
Hyundo Moon [Tue, 6 Mar 2018 09:44:22 +0000 (09:44 +0000)]
Merge "MediaSession2: Update Builder" into pi-dev
am:
9bc5610869
Change-Id: I4f7a5e40cd2f0d35c16ba2cdc79c2ec1d3bdb881
Bill Yi [Tue, 6 Mar 2018 09:28:50 +0000 (09:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
f7995d280c -s ours am:
f2d1f3da86 -s ours
am:
a60edc8df4 -s ours
Change-Id: Ie6cd347de2ec1526a56b10591a3a76c9b61b4712
Felipe Leme [Tue, 6 Mar 2018 09:00:42 +0000 (09:00 +0000)]
Merge "Merge "Destroy fill UI when app dies." into pi-dev am:
8ab878ebe0" into pi-dev-plus-aosp
am:
72aa933397
Change-Id: I759a9381f00d3e2dbf9fa668eddc29287a19aede
TreeHugger Robot [Tue, 6 Mar 2018 08:59:13 +0000 (08:59 +0000)]
Merge "MediaSession2: Update Builder" into pi-dev
Insun Kang [Tue, 6 Mar 2018 08:59:05 +0000 (08:59 +0000)]
Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev
am:
27ed96bf0c
Change-Id: I754bda631577db7179f0d7811b75a26a8a9c392a
Hall Liu [Tue, 6 Mar 2018 08:38:22 +0000 (08:38 +0000)]
Merge "Add an app-ops check when registering for location" am:
b376f02260 am:
be9359343e
am:
1976c21a7d
Change-Id: I4a2999adb3c3904fddb3dbbfb99395dcad120098
Mike Ma [Tue, 6 Mar 2018 08:33:57 +0000 (08:33 +0000)]
Merge "Power profile audio & video support" into pi-dev
am:
1ab03020db
Change-Id: I073bc1f1ab6ff7be692df042b94e05cba42eea2d
Erik Kline [Tue, 6 Mar 2018 08:25:03 +0000 (08:25 +0000)]
Merge "Fail if the interface is not available when starting" into pi-dev
am:
a69df717ce -s ours
Change-Id: I2ef43e57db77d84d9c6e80cb14b7cb78db42f49e
Jeffrey Vander Stoep [Tue, 6 Mar 2018 08:22:20 +0000 (08:22 +0000)]
Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"
This reverts commit
8196fd9380a8efe2d7fed0652b9e3b5285b02b61.
Reason for revert: b/
74214574
Bug:
74214574
Change-Id: I9602872238ccc8a49d8b200e5389995d597f1c3a
Matthew Ng [Tue, 6 Mar 2018 08:18:34 +0000 (08:18 +0000)]
Merge "Shows the correct home icon when quickstep is enabled on startup" into pi-dev
am:
a2546208a6
Change-Id: I5e5cdc1f75ec7c3f300ad3c4f0a1e95d85636fa0
Wei Jia [Tue, 6 Mar 2018 08:07:34 +0000 (08:07 +0000)]
Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev
am:
97d579d1ee
Change-Id: I26d1541c0d016181be09afdb172715fda3dc41dc
Tony Wickham [Tue, 6 Mar 2018 08:04:54 +0000 (08:04 +0000)]
Merge "Adjust recents onboarding logic" into pi-dev am:
2cb0244ade
am:
5e828f57bc
Change-Id: I1026bb850649fdeeeafb5604f223b5a2f1d1661a
Jack He [Tue, 6 Mar 2018 07:58:11 +0000 (07:58 +0000)]
Merge "Bluetooth: Use enums for adapter connection states" into pi-dev
am:
faf6589748
Change-Id: I5b87108b96afb0e0c0e4f1de16901e785b50b7bd
TreeHugger Robot [Tue, 6 Mar 2018 07:55:14 +0000 (07:55 +0000)]
Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev
Android Build Merger (Role) [Tue, 6 Mar 2018 07:47:34 +0000 (07:47 +0000)]
Merge "Merge "Minor cleanups to NetworkStats interface tracking." am:
6455e31b76 am:
65777e4b61" into pi-dev-plus-aosp
Lorenzo Colitti [Tue, 6 Mar 2018 07:47:11 +0000 (07:47 +0000)]
Merge "Minor cleanups to NetworkStats interface tracking." am:
6455e31b76
am:
65777e4b61
Change-Id: Ifa76adb79440b1d97c6cfc637509c0ddaefa76fa
Bill Yi [Tue, 6 Mar 2018 07:44:55 +0000 (07:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
f7995d280c -s ours
am:
f2d1f3da86 -s ours
Change-Id: I1a611551d3517f43349c671a36b1a147ebd280e0
TreeHugger Robot [Tue, 6 Mar 2018 07:44:28 +0000 (07:44 +0000)]
Merge "Power profile audio & video support" into pi-dev
Android Build Merger (Role) [Tue, 6 Mar 2018 07:41:18 +0000 (07:41 +0000)]
Merge "Merge "Destroy fill UI when app dies." into pi-dev am:
8ab878ebe0" into pi-dev-plus-aosp
Jerry Zhang [Tue, 6 Mar 2018 07:39:47 +0000 (07:39 +0000)]
Merge "Check mMediaProvider for null" into pi-dev am:
cefe0c6518
am:
955b8209ab
Change-Id: If0c3a5c21f23e9aa98dd70bec3678a8785469973
Hall Liu [Tue, 6 Mar 2018 07:36:42 +0000 (07:36 +0000)]
Merge "Add an app-ops check when registering for location" am:
b376f02260
am:
be9359343e
Change-Id: I2490e155ca7436b1e38e5539f4215ba65b666b3e
Felipe Leme [Tue, 6 Mar 2018 07:30:29 +0000 (07:30 +0000)]
Merge "Destroy fill UI when app dies." into pi-dev
am:
8ab878ebe0
Change-Id: I22b980126fad511fba43250d1056212c494519cd
Jack He [Tue, 6 Mar 2018 07:30:13 +0000 (07:30 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev am:
4a3dd2ba58
am:
c3ede0cdf3
Change-Id: I2d3d34c757b3a0a73eb289981540ee6c91249d2f
Lorenzo Colitti [Tue, 6 Mar 2018 07:28:20 +0000 (07:28 +0000)]
Merge "Minor cleanups to NetworkStats interface tracking."
am:
6455e31b76
Change-Id: I84aad4b9815196e0362d6adba34359a260853f46
Fyodor Kupolov [Tue, 6 Mar 2018 07:18:09 +0000 (07:18 +0000)]
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev am:
d97a0f1ac5
am:
d4315862cc
Change-Id: Ia73f006301d8225f7906612faa381f4307a23b51
Hall Liu [Tue, 6 Mar 2018 07:17:02 +0000 (07:17 +0000)]
Merge "Add an app-ops check when registering for location"
am:
b376f02260
Change-Id: I5a41e4080088ac1a62d67f18649ca44ddf0eed9c
Jack He [Tue, 6 Mar 2018 07:08:37 +0000 (07:08 +0000)]
Merge "Merge "Bluetooth: Use enums for adapter connection states" am:
95372e873e am:
8da4504cad" into pi-dev-plus-aosp
am:
3bc933c57f
Change-Id: I87ca2c0e8f11e17e0ac3aa14d3eb77415b5b9473
Tony Wickham [Tue, 6 Mar 2018 07:06:45 +0000 (07:06 +0000)]
Merge "Adjust recents onboarding logic" into pi-dev
am:
2cb0244ade
Change-Id: I5421c16fbf0af59254670399ae6734beba5370a4
Hyundo Moon [Tue, 6 Mar 2018 06:37:43 +0000 (15:37 +0900)]
MediaSession2: Update Builder
This CL updates following APIs of session builder:
- setPlayer
- setPlaylistController
- setVolumeController
Bug:
74093082
Test: runtest-MediaComponents
Change-Id: I88365e740df7e14edf439cbed2106f788d027f53
Erik Kline [Tue, 6 Mar 2018 05:53:29 +0000 (05:53 +0000)]
Merge "Fail if the interface is not available when starting" into pi-dev
Insun Kang [Mon, 5 Mar 2018 04:41:39 +0000 (13:41 +0900)]
VideoView2: Move MediaContolView2's hidden constant
Bug:
74173212
Test: VideoViewTest app
Change-Id: Ic91e0b0bfb910d555c1dbe77f028a017f2a18b79
(cherry picked from commit
a0fdcc97f0e49162198142726381cd5746971a2c)
TreeHugger Robot [Tue, 6 Mar 2018 05:19:26 +0000 (05:19 +0000)]
Merge "Filter out detached views from touch"
TreeHugger Robot [Tue, 6 Mar 2018 04:14:27 +0000 (04:14 +0000)]
Merge "Shows the correct home icon when quickstep is enabled on startup" into pi-dev
Ben Lin [Tue, 6 Mar 2018 04:01:39 +0000 (04:01 +0000)]
Merge "Add new Intent start a package's Open By Default page directly."
Wei Jia [Tue, 6 Mar 2018 03:42:25 +0000 (03:42 +0000)]
Merge "MediaPlayer2: clarify sync/async for API's" into pi-dev
Jerry Zhang [Tue, 6 Mar 2018 03:34:50 +0000 (03:34 +0000)]
Merge "Check mMediaProvider for null" into pi-dev
am:
cefe0c6518
Change-Id: I8c901d37c99d1e144c7b2cdf2d66531eee02bb3c
TreeHugger Robot [Tue, 6 Mar 2018 03:33:42 +0000 (03:33 +0000)]
Merge "Bluetooth: Use enums for adapter connection states" into pi-dev
Bill Yi [Tue, 6 Mar 2018 03:29:14 +0000 (03:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f7995d280c -s ours
Change-Id: I707bc618a85429e55a5ec60b4a430fe952e65fc2
Android Build Merger (Role) [Tue, 6 Mar 2018 03:28:59 +0000 (03:28 +0000)]
Merge "Merge changes Iecf8b207,I2f2a05ef into pi-dev am:
081d3d2d89 am:
ab3b6e2fdc"
Dongwon Kang [Tue, 6 Mar 2018 03:28:35 +0000 (03:28 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev am:
081d3d2d89
am:
ab3b6e2fdc
Change-Id: I7aa7db5adb2984a12adebe85629af2571972dc89
TreeHugger Robot [Tue, 6 Mar 2018 03:26:26 +0000 (03:26 +0000)]
Merge "Refactor cpu stats pullers"
Tej Singh [Tue, 6 Mar 2018 03:17:38 +0000 (03:17 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class" am:
84bda3a709 -s ours am:
f2fdc81f33 -s ours
am:
5455200b3e -s ours
Change-Id: I820bc9c0b4a9ea2c3599e6d8eef4feb2451e2ac0
Tony Mak [Tue, 6 Mar 2018 03:07:13 +0000 (03:07 +0000)]
Merge "Merge "Improve javadocs of some DPM APIs" into pi-dev am:
889cf2e00d" into pi-dev-plus-aosp
am:
38f8558f8f
Change-Id: I7255bcf1b2ac930476877dfa38e3a44eab8684c3
Felipe Leme [Tue, 6 Mar 2018 02:51:22 +0000 (02:51 +0000)]
Merge "Destroy fill UI when app dies." into pi-dev
Chen Xu [Tue, 6 Mar 2018 02:37:52 +0000 (02:37 +0000)]
Merge "API review: rename CarrierIdentification to Carrier id" am:
f01600d5f9 am:
ce7404744f
am:
1f56d18fd1
Change-Id: If3f000c6213fb24fc964c8450cfb55a70653b863
TreeHugger Robot [Tue, 6 Mar 2018 02:21:20 +0000 (02:21 +0000)]
Merge "Do not allow ScrimView backgrounds"
Jack He [Tue, 6 Mar 2018 02:19:37 +0000 (02:19 +0000)]
Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am:
6ec103c746 am:
472ff2a79d" into pi-dev-plus-aosp
am:
bfd4a037b6
Change-Id: I7aade4a7c227208a9d0efaebcd119c6b5823a2bb
Treehugger Robot [Tue, 6 Mar 2018 02:18:39 +0000 (02:18 +0000)]
Merge "Minor cleanups to NetworkStats interface tracking."
Hall Liu [Tue, 6 Mar 2018 02:14:45 +0000 (02:14 +0000)]
Merge "Add an app-ops check when registering for location"
Erik Kline [Fri, 2 Mar 2018 07:51:13 +0000 (16:51 +0900)]
Fail if the interface is not available when starting
Addresses a long-standing TODO. Now, when calling IpClient's
startProvisioning(), the interface has to be available (i.e.
InterfaceParams#getByName() must return non-null).
Also:
- add a test
- refactor for testability
- delete some constructors no longer used
- properly handle passed-in null IpClient.Callback
- some more IpManager -> IpClient renaming
- permit recording metrics before starting a provisioning
attempt (logging immediate errors) without Log.wtf().
Test: as follows
- built
- flashed
- booted
- runtest frameworks/opt/net/wifi/tests/wifitests/runtests.sh passes
- runtest frameworks-net passes
- basic WiFi IpClient connections works fine
Bug:
62476366
Bug:
73487570
Merged-In: I68e5e24122dc31e730cdbe8d75e33847e6332da4
Merged-In: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b
Merged-In: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e
Change-Id: Ic83ad2a65637277dcb273feb27b2d1bb7a11eb2b
(cherry picked from commit
b152cd0aa4f333b721615bb17773b35a989245fb)
Mike Ma [Sat, 3 Mar 2018 00:57:31 +0000 (16:57 -0800)]
Power profile audio & video support
Add power consumed by audio and video hardware to power profile.
Attribute these power to specific app.
Bug:
70531798
Test: PowerProfileTest
Test: BatteryStatsHelperTest
Test: PowerCalculatorTest
Change-Id: I4811efa14ce97983258cd59bfd328181fe95baf4
TreeHugger Robot [Tue, 6 Mar 2018 02:03:26 +0000 (02:03 +0000)]
Merge "Don't send config change when display is removed"
TreeHugger Robot [Tue, 6 Mar 2018 02:03:02 +0000 (02:03 +0000)]
Merge "Adjust recents onboarding logic" into pi-dev
TreeHugger Robot [Tue, 6 Mar 2018 01:59:14 +0000 (01:59 +0000)]
Merge "Check mMediaProvider for null" into pi-dev
Beverly [Tue, 6 Mar 2018 01:52:39 +0000 (01:52 +0000)]
Merge "Metric constants for dnd system and duration" into pi-dev am:
74cfe56742
am:
748053c856
Change-Id: I146e7e976949b448b4a1041fda04472652d6a65f
Jack He [Tue, 6 Mar 2018 01:46:00 +0000 (01:46 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev
am:
4a3dd2ba58
Change-Id: I048b234c483a74428fdc5ce4c9ded9e2995ae931
Evan Laird [Tue, 6 Mar 2018 01:42:41 +0000 (01:42 +0000)]
Merge "Merge "Move SignalDrawable to SettingsLib so every can enjoy it" am:
2fa0f7964f am:
d9152570b0 -s ours" into pi-dev-plus-aosp
am:
34245e249d -s ours
Change-Id: If4a6925dae1b43b2dca292495408ebf3c5970a87
Jack He [Fri, 2 Mar 2018 21:11:27 +0000 (13:11 -0800)]
Bluetooth: Use enums for adapter connection states
Bug:
69478930
Test: make, no user visible change
Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1
(cherry picked from commit
ee81f9915041875a8c9b6b71a39cb0508f6d7b22)
Mike Digman [Tue, 6 Mar 2018 01:26:59 +0000 (01:26 +0000)]
Merge "Increase rotate suggestion timeout in fullscreen" into pi-dev am:
ea36a69c7c
am:
c27a9db285
Change-Id: Ia59ac0e48740f25f52b6d1252e63eaa1524a10a6
Fyodor Kupolov [Tue, 6 Mar 2018 01:25:42 +0000 (01:25 +0000)]
Merge "Revert "Allow restoring of apps that rotated key"" into pi-dev
am:
d97a0f1ac5
Change-Id: Ide1400a320ec6f3d5428fdfffae613d15319afe3
TreeHugger Robot [Tue, 6 Mar 2018 01:23:57 +0000 (01:23 +0000)]
Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" into pi-dev
Android Build Merger (Role) [Tue, 6 Mar 2018 01:17:42 +0000 (01:17 +0000)]
Merge "Merge "Bluetooth: Use enums for adapter connection states" am:
95372e873e am:
8da4504cad" into pi-dev-plus-aosp
Jack He [Tue, 6 Mar 2018 01:17:15 +0000 (01:17 +0000)]
Merge "Bluetooth: Use enums for adapter connection states" am:
95372e873e
am:
8da4504cad
Change-Id: I7e0ed2b7a0b67bb443b9e104a7985e3a9bed96ff
Dongwon Kang [Tue, 6 Mar 2018 01:15:50 +0000 (01:15 +0000)]
Merge changes Iecf8b207,I2f2a05ef into pi-dev
am:
081d3d2d89
Change-Id: If5ac9d3e67a0156f6bbe9397c13e036b3ba9a815
Matthew Ng [Fri, 2 Mar 2018 23:16:03 +0000 (15:16 -0800)]
Shows the correct home icon when quickstep is enabled on startup
The wrong home icon was shown on startup because it takes sometime for
the disabled flags to set disable recents flag that determines if
overview is enabled. When it changes to be true update nav bar icons.
Test: boot phone and look at nav bar
Change-Id: Ib1c00cfa1c3eb0444ccc985dfaf1b3c74e790692
Fixes:
74071465
Wei Jia [Tue, 6 Mar 2018 01:08:10 +0000 (01:08 +0000)]
Merge "OWNER: add wjia" into pi-dev am:
0db51ad50e
am:
bc88942540
Change-Id: If80db15fb6fc2650061fbdcd0a8d72a4a0141b81
Tej Singh [Tue, 6 Mar 2018 01:07:22 +0000 (01:07 +0000)]
Merge "DO NOT MERGE Dummy StatsLog class" am:
84bda3a709 -s ours
am:
f2fdc81f33 -s ours
Change-Id: I74e707e09a47c976acfb3c39acdc1c0d53012855
Android Build Merger (Role) [Tue, 6 Mar 2018 01:03:33 +0000 (01:03 +0000)]
Merge "Merge "Improve javadocs of some DPM APIs" into pi-dev am:
889cf2e00d" into pi-dev-plus-aosp
Tony Mak [Tue, 6 Mar 2018 01:03:14 +0000 (01:03 +0000)]
Merge "Improve javadocs of some DPM APIs" into pi-dev
am:
889cf2e00d
Change-Id: I39e374287a4c37dfd644e5b4292f0801070ce6ad