OSDN Git Service
TreeHugger Robot [Tue, 9 Jan 2018 22:39:16 +0000 (22:39 +0000)]
Merge "Add missing usb_device_close() in (native) getDescriptorString()."
TreeHugger Robot [Tue, 9 Jan 2018 22:37:32 +0000 (22:37 +0000)]
Merge "Lower FSP on window animation too"
Michal Karpinski [Tue, 9 Jan 2018 22:35:33 +0000 (22:35 +0000)]
Merge "Drop support for full backup of com.android.providers.settings"
Myles Watson [Tue, 9 Jan 2018 22:34:23 +0000 (22:34 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)" am:
37275780c0 am:
152b4f28b0
am:
96f4e49339
Change-Id: Ie321dd5d94bbc827d88855b634bc6a538d432918
Myles Watson [Tue, 9 Jan 2018 22:26:57 +0000 (22:26 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)" am:
37275780c0
am:
152b4f28b0
Change-Id: I765260e8358d6c7f34a72b5f3ef4601579aebf03
Tomasz Wasilczyk [Tue, 9 Jan 2018 22:20:14 +0000 (22:20 +0000)]
Merge "Implement front-end APIs for config flags."
Myles Watson [Tue, 9 Jan 2018 22:19:53 +0000 (22:19 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"
am:
37275780c0
Change-Id: Ie3c40bcfd0f0eee0f8fe1ed8cac680f2c139de0f
Treehugger Robot [Tue, 9 Jan 2018 22:10:01 +0000 (22:10 +0000)]
Merge "BluetoothProfile: Add Object Push Profile (OPP)"
TreeHugger Robot [Tue, 9 Jan 2018 22:09:53 +0000 (22:09 +0000)]
Merge "Disable airplane mode quick settings when disallow_airplane_mode is set."
Victor Hsieh [Tue, 9 Jan 2018 22:09:10 +0000 (22:09 +0000)]
Merge "Move zygote's seccomp setup to post-fork" am:
5d33c10a96 am:
b629f9e12c
am:
dacb02bf5a -s ours
Change-Id: I3c684dcd5c2776060f32ef48b83774db5fd41d04
TreeHugger Robot [Tue, 9 Jan 2018 22:03:17 +0000 (22:03 +0000)]
Merge "Add metric for Smart battery page."
Andrew Solovay [Tue, 9 Jan 2018 21:59:05 +0000 (21:59 +0000)]
docs: Adding file to support staging reference docs am:
c40eccd9ad
am:
afa73636f7
Change-Id: I3e9bd5ee15e3d820e9cc73782417c7d273f280bb
Victor Hsieh [Tue, 9 Jan 2018 21:58:58 +0000 (21:58 +0000)]
Merge "Move zygote's seccomp setup to post-fork" am:
5d33c10a96
am:
b629f9e12c
Change-Id: I7d4c6b22c70955a9f594b0e55149a203df56f6fc
Paul Duffin [Tue, 9 Jan 2018 21:57:14 +0000 (21:57 +0000)]
Merge "Add apis needed for android.test.legacy"
Victor Hsieh [Tue, 9 Jan 2018 21:51:57 +0000 (21:51 +0000)]
Merge "Move zygote's seccomp setup to post-fork"
am:
5d33c10a96
Change-Id: I1baf09c5b8924e070b473725548faf8a5b48a623
Treehugger Robot [Tue, 9 Jan 2018 21:41:19 +0000 (21:41 +0000)]
Merge "Move zygote's seccomp setup to post-fork"
Android Build Merger (Role) [Tue, 9 Jan 2018 21:39:38 +0000 (21:39 +0000)]
Merge "Merge "Fix sync initialization on secondary users" am:
99f99a52e7 am:
ad4c0c4add am:
e66f28c6ee"
Makoto Onuki [Tue, 9 Jan 2018 21:39:14 +0000 (21:39 +0000)]
Merge "Fix sync initialization on secondary users" am:
99f99a52e7 am:
ad4c0c4add
am:
e66f28c6ee
Change-Id: Ic45e3ffddf917fbb02b38aae2623e3cdddb85666
Andrew Solovay [Tue, 9 Jan 2018 21:35:52 +0000 (21:35 +0000)]
docs: Adding file to support staging reference docs
am:
c40eccd9ad
Change-Id: I1fd3ee5b710619db76e8c488e1bfaf00950e0b05
TreeHugger Robot [Tue, 9 Jan 2018 21:35:14 +0000 (21:35 +0000)]
Merge "Add hidden APIs that return user start/unlock time."
Android Build Merger (Role) [Tue, 9 Jan 2018 21:35:12 +0000 (21:35 +0000)]
Merge "Merge "Fix ResolverActivity don't show items" am:
e251bb72ed am:
7fd3a8d08b am:
0a0a49a022"
gaochong [Tue, 9 Jan 2018 21:34:50 +0000 (21:34 +0000)]
Merge "Fix ResolverActivity don't show items" am:
e251bb72ed am:
7fd3a8d08b
am:
0a0a49a022
Change-Id: I8e623f3e8493d1147fcf873fb6491e83b2c2edfe
Rob Carr [Tue, 9 Jan 2018 17:10:00 +0000 (17:10 +0000)]
Revert "Restore old stack Z ordering promotion."
This reverts commit
d92e7eb2e9a72ac73e992cf502a080ad47a962f3.
Reason for revert: Causes
71736995
Change-Id: I8294bdb65a496bfd0170ec606d20d604d5ef6271
Rob Carr [Tue, 9 Jan 2018 17:09:51 +0000 (17:09 +0000)]
Revert "Ensure docked divider is below always-on-top stacks."
This reverts commit
11408826496a2c7a8b23e97ec3340972b0df8c36.
Reason for revert: CL earlier in chain causes
71736995
Change-Id: Ifd4bbdb5a3c1fbe95c3e9f6b0172c022d43fcdf6
Rob Carr [Tue, 9 Jan 2018 21:30:01 +0000 (21:30 +0000)]
Merge "Revert "Superficial improvements to ZOrderingTest.""
Android Build Merger (Role) [Tue, 9 Jan 2018 21:29:50 +0000 (21:29 +0000)]
Merge "Merge "Remove hashing for PII in Telecom Logging" am:
e77808d936 am:
388aca53f1 am:
d8b0a97ce4"
Brad Ebinger [Tue, 9 Jan 2018 21:28:13 +0000 (21:28 +0000)]
Merge "Remove hashing for PII in Telecom Logging" am:
e77808d936 am:
388aca53f1
am:
d8b0a97ce4
Change-Id: I4867c726c391a346510c5579c7987bb868277f69
TreeHugger Robot [Tue, 9 Jan 2018 21:27:23 +0000 (21:27 +0000)]
Merge "Cross profile apps animation part 2"
TreeHugger Robot [Tue, 9 Jan 2018 21:26:12 +0000 (21:26 +0000)]
Merge "Fix WTF in shortcuts."
Android Build Merger (Role) [Tue, 9 Jan 2018 21:24:06 +0000 (21:24 +0000)]
Merge "Merge "Add validation to IpSecConfig algorithm setters" am:
a954f20f46 am:
c93df5ca1c am:
764a0b739a"
Benedict Wong [Tue, 9 Jan 2018 21:23:35 +0000 (21:23 +0000)]
Merge "Add validation to IpSecConfig algorithm setters" am:
a954f20f46 am:
c93df5ca1c
am:
764a0b739a
Change-Id: I7ff85771945c68025ce8d66ca85313bac087b3a5
TreeHugger Robot [Tue, 9 Jan 2018 21:20:23 +0000 (21:20 +0000)]
Merge "Anomaly detection is per dimension"
Todd Kennedy [Tue, 9 Jan 2018 21:18:54 +0000 (21:18 +0000)]
Merge "Add patb to owners" am:
a2525e506d am:
d14b30205c
am:
536078de96
Change-Id: I6f78e74d559f5720b19fc89fb7c477734d66d9eb
TreeHugger Robot [Tue, 9 Jan 2018 21:13:22 +0000 (21:13 +0000)]
Merge "Detect sync handler stuck"
Makoto Onuki [Tue, 9 Jan 2018 21:13:15 +0000 (21:13 +0000)]
Merge "Fix sync initialization on secondary users" am:
99f99a52e7
am:
ad4c0c4add
Change-Id: I6f991fc7e2186253852cabf55ea95a6a0fbeb6da
Oscar Shu [Tue, 9 Jan 2018 21:12:57 +0000 (21:12 +0000)]
Merge "API cleanup - delete @removed methods"
TreeHugger Robot [Tue, 9 Jan 2018 21:12:02 +0000 (21:12 +0000)]
Merge changes I9ff5e6fd,I753c0ba0
* changes:
Call prepareSurfaces in applySurfacesChangesTransaction
Revert "Revert "Avoid setting size/position on Transaction if not needed""
Mehdi Alizadeh [Tue, 9 Jan 2018 21:11:18 +0000 (21:11 +0000)]
Merge "Updates comment for SOFT_AP_TIMEOUT_ENABLED"
Android Build Merger (Role) [Tue, 9 Jan 2018 21:11:13 +0000 (21:11 +0000)]
Merge "Merge "Rename RadioNetworkConstants to NetworkConstants." am:
289b3fbca8 am:
4d2ffac581 am:
c84d79740e"
Malcolm Chen [Tue, 9 Jan 2018 21:10:15 +0000 (21:10 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants." am:
289b3fbca8 am:
4d2ffac581
am:
c84d79740e
Change-Id: I2998277c63caa244aba07372ac8104aeeed85529
Eino-Ville Talvala [Tue, 9 Jan 2018 21:08:00 +0000 (21:08 +0000)]
Merge "Camera2: Add MOTION_TRACKING capability/intent, and lens poseReference"
Makoto Onuki [Tue, 9 Jan 2018 21:06:07 +0000 (21:06 +0000)]
Merge "Fix sync initialization on secondary users"
am:
99f99a52e7
Change-Id: I29f9430a6a3fb8c8a77621f68b0af37b94e3be21
TreeHugger Robot [Tue, 9 Jan 2018 21:04:29 +0000 (21:04 +0000)]
Merge "Update on a few DevicePolicyManager APIs for affiliated PO"
Treehugger Robot [Tue, 9 Jan 2018 20:56:47 +0000 (20:56 +0000)]
Merge "Fix sync initialization on secondary users"
Paul McLean [Tue, 9 Jan 2018 20:55:47 +0000 (12:55 -0800)]
Add missing usb_device_close() in (native) getDescriptorString().
Bug:
71359796
Test: Connect SkyLab and Mir devices and observe correct expected behavior.
Change-Id: I70b5df2f381330b073f6fc7086db493da44b1bb1
gaochong [Tue, 9 Jan 2018 20:47:22 +0000 (20:47 +0000)]
Merge "Fix ResolverActivity don't show items" am:
e251bb72ed
am:
7fd3a8d08b
Change-Id: Ia76b696bcd1ec5763ec3da41fae4c8c2bce9b820
Hans Boehm [Tue, 9 Jan 2018 20:46:35 +0000 (20:46 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash" am:
90027eb1c2 am:
c9e7c10afb
am:
f81791c141
Change-Id: Ide59ad63505d92503da64bb70691ff370a548746
Ruchi Kandoi [Tue, 9 Jan 2018 20:42:02 +0000 (20:42 +0000)]
Merge "Don't wait for NFC when shutting down." am:
5d286326b1 am:
a9d1e2a922
am:
ca37d9f3dd -s ours
Change-Id: Icb37e9f862a0d08531964e09158ee84265ccd83a
Makoto Onuki [Tue, 9 Jan 2018 20:35:06 +0000 (12:35 -0800)]
Lower FSP on window animation too
Test: manual test with setprop debug.hwui.fps_divisor 4
Bug:
66945974
Change-Id: I4b637ed30003a9eae008b093f9e3d8b2a2f09319
gaochong [Tue, 9 Jan 2018 20:39:35 +0000 (20:39 +0000)]
Merge "Fix ResolverActivity don't show items"
am:
e251bb72ed
Change-Id: Id4877102db82616c5ad1c6e929721fbddb92b129
Treehugger Robot [Tue, 9 Jan 2018 20:30:29 +0000 (20:30 +0000)]
Merge "Fix ResolverActivity don't show items"
Victor Hsieh [Wed, 20 Dec 2017 17:51:51 +0000 (09:51 -0800)]
Move zygote's seccomp setup to post-fork
Before this change, seccomp filter setup is as early as in zygote's main
function. To make it possible to split app and system server's filter,
this postpone the setup to after fork. It also starts to call app
specific and system server specific setup function.
In terms of performance since this happens at fork, the measure shows
the overhead is negligible. Assuming 130 instruction in the BPF, on
walleye, even when running on little core with fixed low frequency, each
setup took about 60.9us on average. When it runs on big core with
higher frequency, it took about 39.3us.
Test: (cts) -m CtsSecurityTestCases -t android.security.cts.SeccompTest
Bug:
63944145
Change-Id: I748735b478405098beac1e200d911c13ea60e380
Merged-In: I748735b478405098beac1e200d911c13ea60e380
Makoto Onuki [Wed, 20 Dec 2017 04:14:48 +0000 (13:14 +0900)]
Add hidden APIs that return user start/unlock time.
Bug:
69456806
Test: Manual test with "watch dumpsys-user"
Change-Id: I68ed4ef53c707ed7c8cb8be4165052f942ea8ccd
Brad Ebinger [Tue, 9 Jan 2018 19:55:12 +0000 (19:55 +0000)]
Merge "Remove hashing for PII in Telecom Logging" am:
e77808d936
am:
388aca53f1
Change-Id: I6e6ab2560ef73816dad5eff2b40f632fbdcefe33
Benedict Wong [Tue, 9 Jan 2018 19:51:19 +0000 (19:51 +0000)]
Merge "Add validation to IpSecConfig algorithm setters" am:
a954f20f46
am:
c93df5ca1c
Change-Id: I45289bc8e8b93f7eb912a76a10b951b1a615338a
Todd Kennedy [Tue, 9 Jan 2018 19:47:27 +0000 (19:47 +0000)]
Merge "Add patb to owners" am:
a2525e506d
am:
d14b30205c
Change-Id: Idc8607b6a377a560a1a713de8153068ab25594ea
TreeHugger Robot [Tue, 9 Jan 2018 19:43:10 +0000 (19:43 +0000)]
Merge "Move zygote's seccomp setup to post-fork"
Malcolm Chen [Tue, 9 Jan 2018 19:43:02 +0000 (19:43 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants." am:
289b3fbca8
am:
4d2ffac581
Change-Id: I349cd20ecbcb801a1e93d4a215d65df432f5df69
Hans Boehm [Tue, 9 Jan 2018 19:38:55 +0000 (19:38 +0000)]
Merge "Only count uncleared ProxyMap refs when deciding to crash" am:
90027eb1c2
am:
c9e7c10afb
Change-Id: I70169c5eeb5dbdaa751ea7b9369feb3663d79952
Ruchi Kandoi [Tue, 9 Jan 2018 19:35:09 +0000 (19:35 +0000)]
Merge "Don't wait for NFC when shutting down." am:
5d286326b1
am:
a9d1e2a922
Change-Id: Idcc78ffebaa359110b85fbda8569c7dd71b3ec68
Bookatz [Thu, 4 Jan 2018 19:43:20 +0000 (11:43 -0800)]
Anomaly detection is per dimension
Anomalies are now detected and declared per dimension. This means that
declareAnomaly now gets access to the key that is responsible for the
anomaly. Moreover, the refractory period is per dimension, not overall.
So a second anomaly for the same metric but a different dimension can
fire within the first dimension's refractory period. Thus, if app A
misbehaves and app B misbehaves shortly thereafter, they will both be
detected.
Eventually this key will be passed to the subscribers, although this cl
doesn't do anything with it.
Test: adb shell data/nativetest64/statsd_test/statsd_test
Change-Id: Id76856dc44fe9ecf91ac81a423e84f97c81d30ab
Jeff Sharkey [Tue, 9 Jan 2018 19:27:41 +0000 (19:27 +0000)]
Merge "Start using new reserved disk GID."
Brad Ebinger [Tue, 9 Jan 2018 19:26:18 +0000 (19:26 +0000)]
Merge "Remove hashing for PII in Telecom Logging"
am:
e77808d936
Change-Id: Ib3e5180536ded4094c65476f5d5203f6c094f204
Brad Ebinger [Tue, 9 Jan 2018 19:18:42 +0000 (19:18 +0000)]
Merge "Remove hashing for PII in Telecom Logging"
Etan Cohen [Tue, 9 Jan 2018 19:16:51 +0000 (19:16 +0000)]
Merge changes I620d8e72,I532ca35c
* changes:
[RTT2] System API for a Responder Configuration
[RTT2] Baseline public Wi-Fi RTT API
TreeHugger Robot [Tue, 9 Jan 2018 19:05:15 +0000 (19:05 +0000)]
Merge "Initial commit of updatable media API"
Patrick Baumann [Tue, 9 Jan 2018 18:39:45 +0000 (18:39 +0000)]
Merge "Revert "Move signing data into SigningDetails container""
Benedict Wong [Tue, 9 Jan 2018 18:31:14 +0000 (18:31 +0000)]
Merge "Add validation to IpSecConfig algorithm setters"
am:
a954f20f46
Change-Id: I7d241a4348fd1339ff7475ee9301c7fe6c7453c0
Kodlee Yin [Tue, 9 Jan 2018 18:22:07 +0000 (18:22 +0000)]
Merge "Fix compatibility in MessagingStyle."
Benedict Wong [Tue, 9 Jan 2018 18:18:28 +0000 (18:18 +0000)]
Merge "Add validation to IpSecConfig algorithm setters"
Todd Kennedy [Tue, 9 Jan 2018 17:31:44 +0000 (17:31 +0000)]
Merge "Add patb to owners"
am:
a2525e506d
Change-Id: Iae9eaea2fee3253155c957a000ca7eeb80474503
Michal Karpinski [Tue, 9 Jan 2018 17:06:19 +0000 (17:06 +0000)]
Drop support for full backup of com.android.providers.settings
The only reason it was still there was adb backup. It's no longer
needed since we support adb backup K/V since Oreo.
Full restore code has to stay for backwards compatibility, but
will not need to be made forward-compatible, since no backups
will be made on P+.
Test: adb backup com.android.providers.settings
Bug:
71746093
Change-Id: I2e8f90d57ed73bb3e050c0e345afef4ad2d3fb82
Todd Kennedy [Tue, 9 Jan 2018 17:21:12 +0000 (17:21 +0000)]
Merge "Add patb to owners"
Todd Kennedy [Tue, 9 Jan 2018 17:19:15 +0000 (09:19 -0800)]
Add patb to owners
Test: None
Change-Id: I70429cd02fac901efd16e47e6566358c78ae0e23
Rob Carr [Tue, 9 Jan 2018 17:09:20 +0000 (17:09 +0000)]
Revert "Superficial improvements to ZOrderingTest."
This reverts commit
515a40a14980f0df908a0a08c3220854beee8c14.
Reason for revert: CL Earlier in chain causes
71736995
Change-Id: Id1fc0edcad15aa2d785a911a782a05bb6b5766a9
TreeHugger Robot [Tue, 9 Jan 2018 17:03:17 +0000 (17:03 +0000)]
Merge "Cap the size of ice box in StatsdStats."
Jorim Jaggi [Tue, 9 Jan 2018 16:47:11 +0000 (16:47 +0000)]
Merge "Fix SurfaceAnimator and SurfaceAnimationRunner tests"
Olivier Gaillard [Tue, 9 Jan 2018 16:39:00 +0000 (16:39 +0000)]
Merge "Add atoms for app startup time."
TreeHugger Robot [Tue, 9 Jan 2018 16:26:29 +0000 (16:26 +0000)]
Merge "Deprecates classes associated with old ContextHubManager APIs"
Patrick Baumann [Tue, 9 Jan 2018 16:12:36 +0000 (16:12 +0000)]
Revert "Move signing data into SigningDetails container"
This reverts commit
47117fcd7878ae75600cf95075fbdbec58be5da6.
Reason for revert: boot time regression (b/
71718267)
Change-Id: Ice00e63a68ea3aede847c17cc3acda2d0a6b2f24
Bug:
71718267
Bug:
68860689
Ricky Wai [Tue, 9 Jan 2018 16:02:18 +0000 (16:02 +0000)]
Merge "Change Network Watchlist feature flag"
Tony Mak [Thu, 28 Dec 2017 17:44:02 +0000 (17:44 +0000)]
Cross profile apps animation part 2
Show and animate work/personal thumbnail during the transition.
Bug:
70799822
Test: Observe the animation in both normal mode / multi-window mode.
Test: go/wm-smoke
Change-Id: I9d5be689ce8dc9ce5c8197263d35514c68ab6f72
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.
The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.
In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.
It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.
Bug:
30188076
Test: make checkbuild
Change-Id: I85417cc328cab898ab93b9b726648f4232555324
Olivier Gaillard [Tue, 12 Dec 2017 14:26:22 +0000 (14:26 +0000)]
Add atoms for app startup time.
These atoms match exactly what we currently send through Tron.
Test: manual
Change-Id: I36809417c8d5c62d60035be696ddf506243ee2a9
Jorim Jaggi [Fri, 5 Jan 2018 16:23:47 +0000 (17:23 +0100)]
Call prepareSurfaces in applySurfacesChangesTransaction
Instead of doing custom magic by conditionally calling
prepareSurface but only on the WindowAnimator, we just prepare
all surfaces. This avoids issues with transaction position/size
caching as the cached size/position might not be applied early
enough/could be reordered.
Test: go/wm-smoke
Test: Enter split screen, resize things, ensure everything is
absolutely in sync.
Change-Id: I9ff5e6fd37dde9406b1529c86daf42061b282cb2
Jorim Jaggi [Tue, 9 Jan 2018 14:14:15 +0000 (15:14 +0100)]
Revert "Revert "Avoid setting size/position on Transaction if not needed""
Original issue will be fixed with CL in same topic
This reverts commit
d70feb234f47d6088c751f8c5529a29ac3aa029b.
Bug:
71694437
Bug:
71692657
Bug:
71510789
Victor Chang [Tue, 9 Jan 2018 13:59:12 +0000 (13:59 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
Jorim Jaggi [Tue, 9 Jan 2018 13:28:44 +0000 (14:28 +0100)]
Fix SurfaceAnimator and SurfaceAnimationRunner tests
Since we marked mAnimator.mInitialized to true in the tests,
WM executed things from another thread during tests leading to
concurrency bugs.
Instead, we stub out addAfterPrepareSurfacesRunnable to a consumer
which executes the runnable directly during tests, avoiding the
need to let WM process animation frames.
Also attempts to fix flakyness in SurfaceAnimationRunner
Test: go/wm-smoke
Test: SurfaceAnimatorTest
Test: SurfaceAnimationRunnerTest
Change-Id: Ic9522e1afef6ce62667aefca80e58d6fb1db3424
Fixes:
71650763
Fixes:
71602314
Bug:
71719744
TreeHugger Robot [Tue, 9 Jan 2018 13:23:24 +0000 (13:23 +0000)]
Merge "Marked #testCancel_sneakyCancelBeforeUpdate as flaky."
yuemingw [Tue, 9 Jan 2018 11:24:44 +0000 (11:24 +0000)]
Disable airplane mode quick settings when disallow_airplane_mode is set.
Bug:
67628870
Test: manual
Change-Id: I701c58c1e4c3749e49adf2b86c7da94c8dab38db
TreeHugger Robot [Tue, 9 Jan 2018 11:14:25 +0000 (11:14 +0000)]
Merge "Mark translatable="false" for DevicePolicyManager.getDisallowedSystemApps xmls"
Alex Chau [Thu, 4 Jan 2018 15:45:38 +0000 (15:45 +0000)]
Update on a few DevicePolicyManager APIs for affiliated PO
- Disallow managed profile from disabling keyguard and statusBar as it
has no effect
- Removed the ability for affiliated profile owner to set device owner
lockscreen message, as the message is not per user but set globally,
where the original intention is to set a per user lockscreen message
- Updated javadoc accordingly
Bug:
64383519
Test: Invoking setKeyguardDisabled and setStatusBarDisabled with managed profile fails
Change-Id: Ib3fdf44f55a7c5913ea38647c582bc962329c842
TreeHugger Robot [Tue, 9 Jan 2018 10:03:01 +0000 (10:03 +0000)]
Merge changes Ibe8c8d3c,I4a475d6f
* changes:
Thread-safety at log processor level.
Handle null string in jni and c++ stats-log-api interfaces.
TreeHugger Robot [Tue, 9 Jan 2018 09:33:14 +0000 (09:33 +0000)]
Merge "Make SystemApi retained at runtime"
TreeHugger Robot [Tue, 9 Jan 2018 08:46:22 +0000 (08:46 +0000)]
Merge "WorkSource: Fix WorkSource#remove for chained worksources."
Malcolm Chen [Tue, 9 Jan 2018 07:11:43 +0000 (07:11 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants."
am:
289b3fbca8
Change-Id: Ic7d966c3e7ce1b8adc9ca3acd461d6e65df2cffe
Treehugger Robot [Tue, 9 Jan 2018 07:04:01 +0000 (07:04 +0000)]
Merge "Rename RadioNetworkConstants to NetworkConstants."
TreeHugger Robot [Tue, 9 Jan 2018 06:46:22 +0000 (06:46 +0000)]
Merge "Update clock whenever AoD unpauses"
gaochong [Tue, 9 Jan 2018 06:02:23 +0000 (14:02 +0800)]
Fix ResolverActivity don't show items
ResolverActivity sort the list resolved intent with AsyncTask.
The method sort hold CountDownLatch to wait the time-consuming
operation. In some case, the operation doesn't end and the
CountDownLatch can't be released.The default excutor of AsyncTask
is serial. There should release CountDownLatch in destroy()
to avoid this case.
Change-Id: Ie10126f735d9f511dfe086c21f3f5ffaeb831086
Signed-off-by: gaochong <gaochong@xiaomi.com>
Test: manual - repeatedly test ResolverActivity show correctly
Bug:
71730061
Jeff Sharkey [Tue, 9 Jan 2018 05:40:53 +0000 (05:40 +0000)]
Merge "Wire up reserved blocks presence for tests."