OSDN Git Service
Chalard Jean [Thu, 15 Feb 2018 14:23:57 +0000 (14:23 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am:
edab226d0e am:
6fe110fa36
am:
3d3fa22698
Change-Id: Ic6d639358c3310820bd925df93d4843d7edffc57
Lorenzo Colitti [Thu, 15 Feb 2018 14:14:36 +0000 (14:14 +0000)]
Merge changes Icd56662d,I0ece820f am:
47ef64b0d2 am:
bf66580c0b
am:
00d125652e
Change-Id: Idbfe334fec6ded270635eb204686a89d4666a61a
TreeHugger Robot [Thu, 15 Feb 2018 13:57:50 +0000 (13:57 +0000)]
Merge "Update transport connection with registration info"
Chalard Jean [Thu, 15 Feb 2018 13:09:26 +0000 (13:09 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am:
edab226d0e
am:
6fe110fa36
Change-Id: Iebc6a31b975fd7ba429bd9bae89cd9783776d1c3
Chalard Jean [Thu, 15 Feb 2018 12:57:16 +0000 (12:57 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
am:
edab226d0e
Change-Id: I6ffc0a841d0aa8479bb5b6afba49c5130af879da
Artem Iglikov [Thu, 15 Feb 2018 12:10:28 +0000 (12:10 +0000)]
Merge "Revert "Use structural equality for A11yNodeInfo#mChildNodeIds""
Lorenzo Colitti [Thu, 15 Feb 2018 11:52:34 +0000 (11:52 +0000)]
Merge changes Icd56662d,I0ece820f am:
47ef64b0d2
am:
bf66580c0b
Change-Id: I5faf7049c376eb400a41231448d9414471ae6777
Lorenzo Colitti [Thu, 15 Feb 2018 11:43:29 +0000 (11:43 +0000)]
Merge changes Icd56662d,I0ece820f
am:
47ef64b0d2
Change-Id: Ifd2ffe68cfff511d010ce5e755b4b680ad1df52c
Chalard Jean [Thu, 15 Feb 2018 11:25:36 +0000 (11:25 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
* changes:
Deprecate CONNECTIVITY_ACTION.
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
Send null UIDs to apps instead of single-uid lists.
Annie Meng [Fri, 9 Feb 2018 16:01:07 +0000 (16:01 +0000)]
Update transport connection with registration info
When connecting to a transport, let the transport
know if this connection is for registration. This is to
prevent updating transport attributes during registration
in GMSCore.
Bug:
72730566
Test: 1) m -j ROBOTEST_FILTER=TransportManagerTest RunFrameworksServicesRoboTests
2) m -j ROBOTEST_FILTER=TransportClientManagerTest RunFrameworksServicesRoboTests
3) adb reboot; adb logcat | grep BackupTransportManager; check no errors with "...not registered tried to change description"
4) GMSCore Robo tests
Change-Id: I5adf6ea3e668a8e8ed8c568728d109814b6f8975
David Brazdil [Thu, 15 Feb 2018 10:36:49 +0000 (10:36 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"
Lorenzo Colitti [Thu, 15 Feb 2018 10:03:26 +0000 (10:03 +0000)]
Merge changes Icd56662d,I0ece820f
* changes:
Restrict OWNERS in android.net.*
Add OWNERS to the libandroid_net library.
TreeHugger Robot [Thu, 15 Feb 2018 09:41:26 +0000 (09:41 +0000)]
Merge "Add OWNERS for wifi/connectivity related files"
Artem Iglikov [Thu, 15 Feb 2018 09:12:58 +0000 (09:12 +0000)]
Revert "Use structural equality for A11yNodeInfo#mChildNodeIds"
This reverts commit
df99184a81c4a9be3073dc3e6d396a950c9c6be2.
Reason for revert: Crashes settings - b/
73440274
Bug:
73440274
Change-Id: I529874a6110e04d6b5b7723906a03330cd637d1d
TreeHugger Robot [Thu, 15 Feb 2018 08:27:23 +0000 (08:27 +0000)]
Merge "Switch to tron events for battery saver logging"
TreeHugger Robot [Thu, 15 Feb 2018 08:06:45 +0000 (08:06 +0000)]
Merge "Autofill Field Classification improvements."
Lorenzo Colitti [Thu, 15 Feb 2018 07:43:44 +0000 (16:43 +0900)]
Restrict OWNERS in android.net.*
Test: None
Change-Id: Icd56662dcbc86b49015d094fd8ae2ade235aa475
Winson Chung [Thu, 15 Feb 2018 07:25:22 +0000 (07:25 +0000)]
Merge "Enabling more debug logging."
Rebecca Silberstein [Thu, 15 Feb 2018 06:16:35 +0000 (22:16 -0800)]
Add OWNERS for wifi/connectivity related files
Added OWNERS for the wifi dir under frameworks base and per-file owners
for wifi/connectivity related files in internal util
BUG:
73403966
Test: none
Change-Id: I7319394d4b02e6dcfa566192b2822cfc47e72926
TreeHugger Robot [Thu, 15 Feb 2018 06:59:31 +0000 (06:59 +0000)]
Merge "Added new AM method: updatePersistableUriPermission()"
Lorenzo Colitti [Thu, 15 Feb 2018 06:51:58 +0000 (15:51 +0900)]
Add OWNERS to the libandroid_net library.
Test: None
Change-Id: I0ece820fc0de786a81df9f922135acdf92f1d136
TreeHugger Robot [Thu, 15 Feb 2018 06:39:21 +0000 (06:39 +0000)]
Merge "AAPT2: Fix issue with deserializing binary XML"
Makoto Onuki [Tue, 13 Feb 2018 23:02:23 +0000 (15:02 -0800)]
Switch to tron events for battery saver logging
Bug:
73293341
Bug:
73296226
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java
Test: manual test
Change-Id: I2230a4968b985a2a357b535c980deb1f8adb64df
TreeHugger Robot [Thu, 15 Feb 2018 06:17:39 +0000 (06:17 +0000)]
Merge "Fix javadoc to match event payload content."
TreeHugger Robot [Thu, 15 Feb 2018 06:11:59 +0000 (06:11 +0000)]
Merge "Log the elapsed realtime in non-chained interface."
TreeHugger Robot [Thu, 15 Feb 2018 06:11:47 +0000 (06:11 +0000)]
Merge "Add owner files for feature flag utils"
Android Build Merger (Role) [Thu, 15 Feb 2018 06:10:45 +0000 (06:10 +0000)]
Merge "Merge "Hearing Aid profile" am:
aca4460b64 am:
edb16b0f4b am:
44197bd188"
Jakub Pawlowski [Thu, 15 Feb 2018 06:10:08 +0000 (06:10 +0000)]
Merge "Hearing Aid profile" am:
aca4460b64 am:
edb16b0f4b
am:
44197bd188
Change-Id: Idd601780e2e9483324dbf2e317c925daa78fa049
TreeHugger Robot [Thu, 15 Feb 2018 06:06:52 +0000 (06:06 +0000)]
Merge "Couple fixes for M11nGestureHandler"
TreeHugger Robot [Thu, 15 Feb 2018 06:03:38 +0000 (06:03 +0000)]
Merge "Uses ICU DateFormat on new Autofill APIs."
Siyamed Sinir [Thu, 15 Feb 2018 06:02:15 +0000 (06:02 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340 am:
bb0a801a85 am:
dc288fc3ec
am:
9563da198b -s ours
Change-Id: I661608e37de8811ba374dad184b3b49f284fa782
Benedict Wong [Thu, 15 Feb 2018 06:01:49 +0000 (06:01 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created" am:
2c8456b22e am:
3988c929ad
am:
fe9728d494
Change-Id: I511e6b0cadfc24f24a492ae63c48a8b4baa89edb
Jakub Pawlowski [Thu, 15 Feb 2018 05:49:13 +0000 (05:49 +0000)]
Merge "Hearing Aid profile" am:
aca4460b64
am:
edb16b0f4b
Change-Id: Ica92a9ffecb205f07288139970cd83f578ef7669
TreeHugger Robot [Thu, 15 Feb 2018 05:46:47 +0000 (05:46 +0000)]
Merge changes I2f594c22,I37a2b8b8
* changes:
AAPT2: Fix compatible-screens element in AndroidManifest.xml
AAPT2: Add order attribute to groups
Jakub Pawlowski [Thu, 15 Feb 2018 05:37:45 +0000 (05:37 +0000)]
Merge "Hearing Aid profile"
am:
aca4460b64
Change-Id: I2f0367b57ec720c3b46b0f2984b77068db3fa3c1
TreeHugger Robot [Thu, 15 Feb 2018 05:36:23 +0000 (05:36 +0000)]
Merge "Camera: add camera owners"
TreeHugger Robot [Thu, 15 Feb 2018 05:31:17 +0000 (05:31 +0000)]
Merge "Clear lifecycle description on recycle and improve logging."
Svetoslav Ganov [Thu, 15 Feb 2018 04:45:51 +0000 (04:45 +0000)]
Merge "Don't hold the autofill lock when looking up fill compat packages"
TreeHugger Robot [Thu, 15 Feb 2018 04:32:29 +0000 (04:32 +0000)]
Merge "Revert "Fix opacity of expanded shade during transitions""
Felipe Leme [Tue, 13 Feb 2018 02:12:55 +0000 (18:12 -0800)]
Autofill Field Classification improvements.
* Changed the remoteId -> userValue API to userValue -> categoryId so the
category could map to multiple values (for example,
"email" -> "email1", "email2")
* Added method and settings for maximum number of category ids.
* Tuned the default value of some settings.
Bug:
70407264
Test: atest CtsAutoFillServiceTestCases:UserDataTest \
CtsAutoFillServiceTestCases:FieldsClassificationTest \
SettingsBackupTest
Change-Id: I27f348c500077937c0f4bf65db6a899fa3c41cf6
Treehugger Robot [Thu, 15 Feb 2018 04:14:43 +0000 (04:14 +0000)]
Merge "Hearing Aid profile"
TreeHugger Robot [Thu, 15 Feb 2018 04:05:25 +0000 (04:05 +0000)]
Merge "Change string for lockdown button"
TreeHugger Robot [Thu, 15 Feb 2018 03:57:11 +0000 (03:57 +0000)]
Merge "LockSettingsStrongAuth: Use DeathReceipients"
Seigo Nonaka [Thu, 15 Feb 2018 03:56:04 +0000 (03:56 +0000)]
Merge "Revert "Reorganize MeasuredText API""
TreeHugger Robot [Thu, 15 Feb 2018 03:46:19 +0000 (03:46 +0000)]
Merge "Unify automatic storage management enabled checks."
TreeHugger Robot [Thu, 15 Feb 2018 03:39:30 +0000 (03:39 +0000)]
Merge "[EBS] Don't disable location when DISALLOW_CONFIG_LOCATION is set"
TreeHugger Robot [Thu, 15 Feb 2018 03:28:43 +0000 (03:28 +0000)]
Merge "Fix NPE in RNA#start()"
TreeHugger Robot [Thu, 15 Feb 2018 03:15:46 +0000 (03:15 +0000)]
Merge "Add more controls for launcher to control sysui"
TreeHugger Robot [Thu, 15 Feb 2018 03:09:45 +0000 (03:09 +0000)]
Merge "Use structural equality for A11yNodeInfo#mChildNodeIds"
TreeHugger Robot [Thu, 15 Feb 2018 03:07:11 +0000 (03:07 +0000)]
Merge "AudioService: fix deadlock"
TreeHugger Robot [Thu, 15 Feb 2018 02:41:54 +0000 (02:41 +0000)]
Merge "Dump XML files in aapt2 dump"
Svetoslav Ganov [Wed, 14 Feb 2018 22:07:02 +0000 (14:07 -0800)]
Don't hold the autofill lock when looking up fill compat packages
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
Bug:
73072565
Change-Id: I773e1e2f4ceedbe45c9389a065dc7f6fb0ab65b1
Felipe Leme [Thu, 15 Feb 2018 02:03:32 +0000 (18:03 -0800)]
Uses ICU DateFormat on new Autofill APIs.
Test: atest CtsAutoFillServiceTestCases:DateTransformationTest \
CtsAutoFillServiceTestCases:DateValueSanitizerTest
Fixes:
73392044
Fixes:
73392214
Change-Id: I26d20691d8fd68c4c2837f27cc0eee939bb9bf0b
Winson Chung [Thu, 15 Feb 2018 02:14:09 +0000 (18:14 -0800)]
Enabling more debug logging.
Bug:
73003134
Test: None, just enabling debug flags
Change-Id: I22876c4491fd3eb72d77ffaef7a80065b88f1cce
TreeHugger Robot [Thu, 15 Feb 2018 02:04:34 +0000 (02:04 +0000)]
Merge "Add OWNERS files for the recoverable keystore folders"
TreeHugger Robot [Thu, 15 Feb 2018 01:55:37 +0000 (01:55 +0000)]
Merge changes from topic "WifiTrackerRefactor"
* changes:
Consolidate all work in the WorkHandler.
Remove the double lists in WifiTracker.
Delete the MainHandler and remaining code.
Remove methods from MainHandler.
Eugene Susla [Wed, 14 Feb 2018 20:59:29 +0000 (12:59 -0800)]
Couple fixes for M11nGestureHandler
1. Added missing defensive copy for a MotionEvent that is posted
asynchronously with delay, and thus might get recycled
2. Fixed transitioning to viewport dragging on 3tap/shortcut+swipe
Test: manually ensure the fix is working
Bug:
73359125
Change-Id: Iae8cd3a83512ee363abe9f0b5702287d7616c092
Jorim Jaggi [Thu, 15 Feb 2018 01:34:37 +0000 (01:34 +0000)]
Merge "Override all transitions from package start"
TreeHugger Robot [Thu, 15 Feb 2018 01:32:38 +0000 (01:32 +0000)]
Merge "Stop restoring ENABLED_INPUT_METHODS"
Lucas Dupin [Thu, 15 Feb 2018 01:15:24 +0000 (01:15 +0000)]
Revert "Fix opacity of expanded shade during transitions"
This reverts commit
ee98ccb0a3c38ad730041433f9d430bbf3af327e.
Reason for revert: Causing b/
73349375
Change-Id: Ie2cd15ed0522f7768035beb04853a6432be111a9
Fixes:
73349375
Siyamed Sinir [Thu, 15 Feb 2018 00:56:53 +0000 (00:56 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340 am:
bb0a801a85
am:
dc288fc3ec
Change-Id: I55d644d7028d7a69d8aec16c379d052608d7f336
TreeHugger Robot [Thu, 15 Feb 2018 00:50:31 +0000 (00:50 +0000)]
Merge "Ensure we clear binder calling uid prior to removing pinned stacks."
Makoto Onuki [Wed, 14 Feb 2018 22:13:49 +0000 (14:13 -0800)]
[EBS] Don't disable location when DISALLOW_CONFIG_LOCATION is set
If *any* user has DISALLOW_CONFIG_LOCATION set, don't disable location
on battery saver.
Test: Manual test with TestDPC
Test: atest $ANDROID_BUILD_TOP/cts/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverLocationTest.java
Bug:
73004763
Change-Id: Iea7ddf94703463f0f8f2a92a8e76845b986350c3
Siyamed Sinir [Thu, 15 Feb 2018 00:43:01 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340
am:
bb0a801a85
Change-Id: I872e5511439ee880f7837a06d5449f556ffb1ebc
TreeHugger Robot [Thu, 15 Feb 2018 00:40:30 +0000 (00:40 +0000)]
Merge "Adds metrics constants for tron logging in Android TV Settings."
John Reck [Thu, 15 Feb 2018 00:36:16 +0000 (16:36 -0800)]
Fix NPE in RNA#start()
Change-Id: I073e3574cbb7d3195727ef8cde87fc12904c9566
Fixes:
73176211
Test: I guessed
Siyamed Sinir [Thu, 15 Feb 2018 00:31:11 +0000 (00:31 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
am:
1fd506a340
Change-Id: I882d9d4190e2f448a0595192c68ac6caf8ee4607
Felipe Leme [Fri, 26 Jan 2018 00:33:41 +0000 (16:33 -0800)]
Added new AM method: updatePersistableUriPermission()
This method will be used by the DocumentUI's ScopedDirectoryProvider
to update (grant or revoke) Scoped Directory Access permissions.
NOTE: it's currently implemented both on AM and AMS, but the latter will be
replaced by calls to takePersistableUriPermission() or
releasePersistableUriPermission().
Test: manual verification
Test: atest CtsAppSecurityHostTestCases:ScopedDirectoryAccessTest#testResetDoNotAskAgain,testResetGranted
Test: atest CtsAppSecurityHostTestCases:ScopedDirectoryAccessTest
Bug:
63720392
Bug:
72055774
Change-Id: Icd7c8b7756d78fd137ba7b05ab5e35efdfcd19af
Howard Ro [Thu, 15 Feb 2018 00:18:22 +0000 (00:18 +0000)]
Merge "Add a guardrail to limit minimum bucket duration to be 5 minutes except when configured through adb command"
Adam Lesinski [Wed, 14 Feb 2018 21:36:09 +0000 (13:36 -0800)]
AAPT2: Fix issue with deserializing binary XML
We assumed that a raw text value set for an attribute meant there
were no compiled values set either.
This would only really happen for attributes that did not belong to any
namespace (no prefix:), since we always kept their raw string values
in case some code relied on it.
Bug:
72700446
Test: make aapt2_tests
Change-Id: Icba40a1d4b181bfe7cad73131c4dbe5ba7f8b085
Yangster-mac [Thu, 15 Feb 2018 00:09:35 +0000 (16:09 -0800)]
Log the elapsed realtime in non-chained interface.
Test: statsd test
Change-Id: I61e457bd069147fd1b1fc964b27d42d4ec19230d
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:21 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:16 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60
Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
Daniel Nishi [Wed, 24 Jan 2018 02:27:22 +0000 (18:27 -0800)]
Unify automatic storage management enabled checks.
By putting it in SettingsLib, it should be accessible to every app that
needs it.
This also adds in the ability for the framework to define default
behavior. The default behavior for the storage manager enabled status
may differ based upon the device.
Bug:
70893105
Test: SettingsLib Robotests
Change-Id: I9082a77f90289b8fa208c628dd3606000e19495b
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
Yin-Chia Yeh [Wed, 14 Feb 2018 22:31:11 +0000 (14:31 -0800)]
Camera: add camera owners
Change-Id: If597ba281d33736cdadecf8ac2674333d3a30c24
Bryce Lee [Wed, 14 Feb 2018 23:12:01 +0000 (15:12 -0800)]
Clear lifecycle description on recycle and improve logging.
This changelist clear any custom description set on a lifecycle item
and improves the data logged. This changelist should be reverted once
the root cause has been discovered.
Bug:
71506345
Test: manual
Change-Id: I38edb292684745e6e912b3ba09fb220bf7f39149
Shane Farmer [Wed, 14 Feb 2018 23:40:35 +0000 (15:40 -0800)]
AAPT2: Fix compatible-screens element in AndroidManifest.xml
Fix an issue where the compatible-screens element was not being
populated correctly. The previous version was missing the screenSize
attribute which is mandatory. The attributes were also missing the
resource ID from the framework library as these are a part of the public
API.
Change-Id: I2f594c2259831dbbd96c58db4ba55e8288d4231e
Test: unit tests
Test: manually split an APK and dumped with aapt
Jeff Sharkey [Wed, 14 Feb 2018 23:44:11 +0000 (23:44 +0000)]
Merge "Let debug builds set SubscriptionPlan owners."
TreeHugger Robot [Wed, 14 Feb 2018 23:29:47 +0000 (23:29 +0000)]
Merge "Make the platform proto naming consistent, Part 1 Change proto names in incident_helper"
Matthew Ng [Wed, 17 Jan 2018 01:17:24 +0000 (17:17 -0800)]
Add more controls for launcher to control sysui
Added a 4 flags to control the state of system ui:
1. Disable swipe up navigation (prevents motion events going through)
2. Disable quick scrub (& step)
3. Show overview button (hidden by default)
4. Hide back button (shown by default)
Test: manual
Bug:
67957962
Bug:
70180755
Change-Id: Ibc44af9bbdfa9611688fe12285a999d81b8287e9
TreeHugger Robot [Wed, 14 Feb 2018 23:24:57 +0000 (23:24 +0000)]
Merge "Listen for IFingerprintServiceLockoutResetCallback death"
Fan Zhang [Wed, 14 Feb 2018 23:17:27 +0000 (15:17 -0800)]
Add owner files for feature flag utils
Test: rebuild
Change-Id: I23a5724ed3a37350ecbe8fc77861db2b886846cb
Steven Moreland [Wed, 14 Feb 2018 23:12:28 +0000 (23:12 +0000)]
Merge "HIDL: add APIs used by subclasses to SystemApi"
Rob Carr [Wed, 14 Feb 2018 23:10:50 +0000 (23:10 +0000)]
Merge "Assign animation layer above highest animation target."
TreeHugger Robot [Wed, 14 Feb 2018 23:09:47 +0000 (23:09 +0000)]
Merge "Expose AnimationUtils#lockAnimationClock for tests"
Jean-Michel Trivi [Wed, 14 Feb 2018 18:48:51 +0000 (10:48 -0800)]
AudioService: fix deadlock
Source of deadlock:
Thread A:
readAudioSettings()
-> checkAllAliasStreamVolumes()
-> synchronized (VolumeStreamState.class)
-> mStreamStates[streamType].setAllIndexes()
-> synchronized (mSettingsLock)
Thread B:
updateStreamVolumeAlias()
-> mStreamStates[ACCESSIBILITY].setAllIndexes()
-> synchronized (mSettingsLock)
-> synchronized (VolumeStreamState.class)
Fix:
Ensure all calls to VSS.setAllIndexes() are synchronized
on mSettingsLock then on VolumeStreamState.class.
Bug:
72122435
Test: see bug for repro
Change-Id: I16ad1d1df88256291c36d8f5b8ebe830fe1b0b84
Marco Nelissen [Wed, 14 Feb 2018 22:50:39 +0000 (22:50 +0000)]
Merge "Add frameworks/base/media/OWNERS"
TreeHugger Robot [Wed, 14 Feb 2018 22:49:07 +0000 (22:49 +0000)]
Merge "Update the battery charging status when turning battery on/off."
Bo Zhu [Wed, 14 Feb 2018 22:36:48 +0000 (14:36 -0800)]
Add OWNERS files for the recoverable keystore folders
Test: None
Change-Id: I4ad1079cbda4e10ea5f76fb8b3cc280befc62928
Chad Brubaker [Wed, 14 Feb 2018 22:33:10 +0000 (14:33 -0800)]
Change string for lockdown button
Test: visual
Change-Id: I8db30866ea2f0bcf5227f1fe7648439e3f3f7fb1
TreeHugger Robot [Wed, 14 Feb 2018 22:30:53 +0000 (22:30 +0000)]
Merge "Change the cert parsing debugging logs to be more meaningful and less noisy"
Jakub Pawlowski [Wed, 22 Nov 2017 19:02:34 +0000 (11:02 -0800)]
Hearing Aid profile
This is implementation of Hearing Aid Profile that will in future
be connected to Bluetooth Manager - see TODOs in BluetoothHearingAid.java
Bug:
69623109
Test: compilation. Manual test with HA.
Change-Id: I79643ea1e14e9df7f5771169359c964a60c56618
TreeHugger Robot [Wed, 14 Feb 2018 22:21:24 +0000 (22:21 +0000)]
Merge "No alarm warning in dnd dialog if alarms allowed"