OSDN Git Service
Bill Yi [Sat, 12 Aug 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e916c1a05f -s ours
Change-Id: I0cd5c2cac5190abf33d2dc56ebaf4259d358caad
TreeHugger Robot [Sat, 12 Aug 2017 16:36:25 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 12 Aug 2017 16:31:03 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Andrii Kulian [Sat, 12 Aug 2017 06:17:29 +0000 (06:17 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
am:
79e11e4429
Change-Id: Ica3d6afccce4fce1ca1431b3bbb6e7a2b952771d
TreeHugger Robot [Sat, 12 Aug 2017 06:09:06 +0000 (06:09 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
TreeHugger Robot [Sat, 12 Aug 2017 05:59:17 +0000 (05:59 +0000)]
Merge "Catch exception when notifying Settings changes." into oc-mr1-dev
Ian Pedowitz [Sat, 12 Aug 2017 05:38:37 +0000 (05:38 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
am:
8193291ca3 -s ours
Change-Id: I4b4b8117db913ac797abb99b92ae5430193866e6
TreeHugger Robot [Sat, 12 Aug 2017 05:30:30 +0000 (05:30 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
* changes:
Revert "Add (disabled) time zone update system server impl"
Revert "Time zone update API classes"
Neil Fuller [Sat, 12 Aug 2017 04:00:23 +0000 (04:00 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
am:
a031b0d6a1 -s ours
Change-Id: I3971f4e7d4d21630d7055d74207f08813b26d875
TreeHugger Robot [Sat, 12 Aug 2017 03:50:02 +0000 (03:50 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
Bill Yi [Sat, 12 Aug 2017 03:38:57 +0000 (20:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58564c4ab4d58645ebe02e0e2a5e77290bac74fc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Sat, 12 Aug 2017 03:22:35 +0000 (03:22 +0000)]
Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am:
708a1ca16a -s ours" into oc-mr1-dev
Jeff Sharkey [Sat, 12 Aug 2017 03:21:01 +0000 (03:21 +0000)]
Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev
Dan Sandler [Sat, 12 Aug 2017 03:19:18 +0000 (03:19 +0000)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
am:
708a1ca16a -s ours
Change-Id: Id56b3821e6f0166812da2f75c8d41d7a14a0f814
Bill Yi [Sat, 12 Aug 2017 03:08:11 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I72735292fa691c29db26ff02e46390d01e222fb6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Dan Sandler [Sat, 12 Aug 2017 00:30:24 +0000 (20:30 -0400)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
It's @hidden, but CTS needs it to be out of the android.*
namespace too.
Fixes:
64613274
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I753c2cc19111f9ed39e7fc3e006aab096c733ddc
Merged-In: I2046ae17b9e89ac0a83e182b91422fd242bc7557
Neil Fuller [Sat, 12 Aug 2017 00:09:41 +0000 (01:09 +0100)]
Move DISABLE_INPUT_DEVICE permission
Move DISABLE_INPUT_DEVICE permission out of the
reserved android namespace until the next API
version. It appears to be mostly unused.
Fixes:
64615722
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: If77fd9e5c0eede418fa14a37e5e895fee5667576
Merged-In: Ic98af7e3953da63c3c49bfd38d8cfd0ff0646869
Ian Pedowitz [Fri, 11 Aug 2017 22:12:00 +0000 (15:12 -0700)]
Revert "Add (disabled) time zone update system server impl"
This reverts commit
328532ab13768a6303231b670708d750c4d7aa5f.
Fixes:
64606807
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: Iab0fd111803ae9e7615a3b2c825bbe8d84e29edf
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Ian Pedowitz [Fri, 11 Aug 2017 21:23:17 +0000 (14:23 -0700)]
Revert "Time zone update API classes"
This reverts commit
fe6ec56cce981731be7d0bc0e61a0411d0a0d2cf.
Fixes:
64606807
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I238e2b6fa7ce60e6a8cbfebcd13e5e4c596834af
Merged-In: I31b55e88072dd73055cb3d8cf252be6eac920322
Andrii Kulian [Sat, 12 Aug 2017 01:01:11 +0000 (18:01 -0700)]
Update background crop animation threshold
Empiric value for animation epsilon covers only the last
frame of the animation, which is not enough in some case.
This CL makes it a little bigger to cover two last frames.
The change is visually indistinguishable for user.
Bug:
63156733
Test: Go to/from recents with letterboxed app.
Change-Id: I42423527688dcb2dc157ae16bbe5b6de7eee3449
TreeHugger Robot [Sat, 12 Aug 2017 00:16:43 +0000 (00:16 +0000)]
Merge "Rename API to match StorageStats." into oc-mr1-dev
Tomasz Wasilczyk [Sat, 12 Aug 2017 00:16:01 +0000 (00:16 +0000)]
Merge "Implement region guessing." into oc-mr1-dev
TreeHugger Robot [Sat, 12 Aug 2017 00:11:56 +0000 (00:11 +0000)]
Merge "Only destroy the storage area that had trouble." into oc-mr1-dev
Adrian Roos [Fri, 11 Aug 2017 23:54:50 +0000 (23:54 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
am:
1cbfe74fc2
Change-Id: I6b5c4ce303455e592ecb0e6c6bfcd238fbd8a7ef
TreeHugger Robot [Fri, 11 Aug 2017 23:43:11 +0000 (23:43 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
Andrii Kulian [Fri, 11 Aug 2017 23:39:59 +0000 (23:39 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
am:
cff260adfc
Change-Id: Iad8a5b4524d70801eeb7b4abb14626b3ae127e32
Andrii Kulian [Fri, 11 Aug 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 23:27:16 +0000 (23:27 +0000)]
Merge "Removing non-preferred activity from resolution set should not disrupt the preferred resolution" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 23:20:07 +0000 (23:20 +0000)]
Merge "@hide new API" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 22:47:53 +0000 (22:47 +0000)]
Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev
Makoto Onuki [Fri, 11 Aug 2017 22:36:24 +0000 (22:36 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
am:
7b0dec4142
Change-Id: I5498e5a3796a463501917874772be335785e1ca4
Jason Monk [Fri, 11 Aug 2017 22:29:00 +0000 (22:29 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
am:
84626a4e3d
Change-Id: I4c3c5be04aaa1eee409ea706b387370cedf5b15b
TreeHugger Robot [Fri, 11 Aug 2017 21:56:59 +0000 (21:56 +0000)]
Merge "Promoting installExistingPackage to SystemApi" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 21:49:22 +0000 (21:49 +0000)]
Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 21:48:29 +0000 (21:48 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-mr1-dev
Jeff Sharkey [Fri, 11 Aug 2017 21:45:58 +0000 (15:45 -0600)]
Only destroy the storage area that had trouble.
Consider the case where CE failed to prepare; we'd destroy both DE
and CE, but then only recreate CE. This change makes sure we only
destroy something we're willing to recreate.
Bug:
62338545
Test: builds, boots
Change-Id: I566791b59b35a30db70b0de3acfe624b239bf5d2
Cindy Kuang [Fri, 11 Aug 2017 21:42:58 +0000 (21:42 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
f125024688
Change-Id: If510d503dc91c2bfd6a7a282dbf7210cbc7f2698
Android Build Merger (Role) [Fri, 11 Aug 2017 21:40:57 +0000 (21:40 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 21:38:41 +0000 (21:38 +0000)]
Merge "Change PiP menu activity title to prevent duplicate announcement." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 21:37:06 +0000 (21:37 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:34:57 +0000 (21:34 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
07f5257b19
Change-Id: I0ac6fa46922bb2866cfb416763dfcfac10fdd909
Jeff Sharkey [Fri, 11 Aug 2017 21:29:40 +0000 (15:29 -0600)]
Catch exception when notifying Settings changes.
Since changes are dispatched through a separate thread, the target
user may have been removed by the time we try sending the change
notification, so log instead of crashing.
Bug:
64402212
Test: builds, boots
Change-Id: I0efdfabf24829bef7a1ecc7b3c97205f87e9769f
Adrian Roos [Fri, 11 Aug 2017 17:43:17 +0000 (19:43 +0200)]
AOD: Fix navbar flicker when transitioning to AOD
Under certain circumstances, the transition to AOD can happen before
the navigation bar gets a chance to hide itself, which happens in a
traversal. To work around this, post turning the screen on such that
it only happens after the next traversal.
Change-Id: I178b9394e7cc6baa8e9552c9819c3ce9b044defb
Fixes:
64599221
Test: Open Whatsapp / Gmail, turn off screen, verify navbar does not flicker.
TreeHugger Robot [Fri, 11 Aug 2017 21:28:00 +0000 (21:28 +0000)]
Merge "Reland: PackageManager: update documentation for FEATURE_WIFI_PASSPOINT" into oc-mr1-dev
Calin Juravle [Fri, 11 Aug 2017 21:22:03 +0000 (21:22 +0000)]
Merge "Ensure dexopt is executed only with consistent package data" into oc-mr1-dev
Jason Monk [Fri, 11 Aug 2017 21:19:04 +0000 (21:19 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:14:33 +0000 (21:14 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: I297557eb072b1fce0395c93c2a770623b5ba1642
Android Build Merger (Role) [Fri, 11 Aug 2017 21:13:27 +0000 (21:13 +0000)]
Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b" into oc-mr1-dev
Jeff Sharkey [Fri, 11 Aug 2017 21:04:12 +0000 (15:04 -0600)]
Rename API to match StorageStats.
Since they're both measuring app code (APKs), name this API
consistently with StorageStats.getAppBytes().
Bug:
64331226
Test: builds, boots
Change-Id: I1b00427b619a78c043b1b5fac2d0e6406b51d454
Michal Karpinski [Fri, 11 Aug 2017 21:09:52 +0000 (21:09 +0000)]
Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev
Pankaj Kanwar [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
am:
bcfa22584b
Change-Id: I36289ff0e5d2949d93ecbc0c18e131772706c9cc
Cindy Kuang [Fri, 11 Aug 2017 21:01:15 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2
Pankaj Kanwar [Fri, 11 Aug 2017 20:52:52 +0000 (20:52 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
Jeff Sharkey [Fri, 11 Aug 2017 20:45:43 +0000 (14:45 -0600)]
Remove a bunch of deprecated @SystemApi.
Verified that nobody should be using these APIs, and they've been
deprecated long enough that we can remove them.
Bug:
62341924,
62263907,
62264550
Test: make -j32 update-api && make
Change-Id: I9a2333ca13e4984b71374aa7ffed081e5106c67e
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
TreeHugger Robot [Fri, 11 Aug 2017 20:38:01 +0000 (20:38 +0000)]
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
TreeHugger Robot [Fri, 11 Aug 2017 20:29:03 +0000 (20:29 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 20:15:58 +0000 (20:15 +0000)]
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
Makoto Onuki [Fri, 11 Aug 2017 19:11:39 +0000 (12:11 -0700)]
WTF when device has no persistent periodic syncs...
... when it most likely has some.
Bug:
64536115
Test: manual
Change-Id: I24c4c950b0266ef22918156c29384bc452f523af
TreeHugger Robot [Fri, 11 Aug 2017 19:23:11 +0000 (19:23 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 19:16:17 +0000 (19:16 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
Jason Monk [Fri, 11 Aug 2017 16:53:36 +0000 (12:53 -0400)]
Change default temp threshold to use shutdown temp
Base the temp threshold to be based on the shutdown temp lowered
by some amount to ensure the warning can be seen before a shutdown.
Test: runtest systemui
Change-Id: I033a776e874d76018592954932ed5127e1b228ae
Fixes:
62845934
Calin Juravle [Fri, 11 Aug 2017 00:23:00 +0000 (17:23 -0700)]
Ensure dexopt is executed only with consistent package data
The main objects bookkeeping packages (PackageParser.Package and its
corresponding ApplicationInfo) may be updated at different times. This
creates a window where the data stored in the ApplicationInfo is out of
date with respect to the data stored in PackageParser.Package.
During install, the two objects are "synced" during doRename which updates
the package code paths.
This CLs moves the dexopt invocation from the install flow after doRename
to ensure that dexopt logic gets a consistent view of the package.
Bug:
64493351
Test: run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m
CtsAppSecurityHostTestCases
inspect oat files after
adb install-multiple CtsClassloaderSplitApp/CtsClassloaderSplitApp.apk
CtsClassloaderSplitAppFeatureA/CtsClassloaderSplitAppFeatureA.apk
CtsClassloaderSplitAppFeatureB/CtsClassloaderSplitAppFeatureB.apk
Change-Id: I9131bcf49eb473a8fdc5eb0032d94080d4e9e94b
Andrii Kulian [Fri, 11 Aug 2017 18:27:00 +0000 (11:27 -0700)]
Don't animate black background on cold launch from launcher
When animating cold start from launcher we can't compute the
progress in SurfaceControlWithBackground#calculateBgCrop() via
tracking status bar insets. This CL won't animate bg crop
in case the progress does not make sense.
Bug:
64598822
Test: Cold launch letterboxed app from launcher.
Change-Id: I82182a3c46dd4f81bcf056d1163f78c450bd9b83
TreeHugger Robot [Fri, 11 Aug 2017 18:18:42 +0000 (18:18 +0000)]
Merge "usb string update" into oc-mr1-dev
Neil Fuller [Fri, 11 Aug 2017 17:50:58 +0000 (17:50 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
Todd Kennedy [Fri, 11 Aug 2017 17:42:14 +0000 (10:42 -0700)]
@hide new API
Change-Id: Ic9cf7ecd80dd99eb8bcfc9810f4a9fddfe8f8fe4
Fixes:
64568898
Test: None. No code change.
TreeHugger Robot [Fri, 11 Aug 2017 17:38:11 +0000 (17:38 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
Nate Fischer [Fri, 11 Aug 2017 17:36:42 +0000 (17:36 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 17:26:07 +0000 (17:26 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
Beverly [Fri, 11 Aug 2017 16:49:56 +0000 (12:49 -0400)]
Each package can enqueue one toast at a time.
Change-Id: I5fe3db663d1d13ece8c670ca60bdc76dcaa5cc72
Fixes:
64529000
Test: manual
Todd Kennedy [Fri, 11 Aug 2017 17:15:04 +0000 (10:15 -0700)]
Save observer in call to commit
The observer used to be saved in a round-about way; being passed
to the "commit" message handler and set there. The idea was that
if there were multiple calls to commit() with different observers,
it would be strange to wipe out the first observer during the
second call to commit. However, setting the observer only in the
commit handler means there are other methods [namely abandon()
and setPermissionsResult()] where the observer will either not
be called unless the commit message handler was run or the first
observer might be wiped out with multiple commit calls.
The only way to track this properly would be to generate a
commit ID and assign an observer with that commit ID. However,
there doesn't appear to be a legit use case for a caller to invoke
commit multiple times on the same session with different observers.
So, we just set the observer directly in the commit() method.
Change-Id: I5e0d6c163ea84d1f49780aa899afb2e1cdf17584
Fixes:
64564511
Test: cts-tradefed run commandAndExit cts-dev -t android.appsecurity.cts.PkgInstallSignatureVerificationTest#testInstallEphemeralRequiresV2Signature -m CtsAppSecurityHostTestCases
TreeHugger Robot [Fri, 11 Aug 2017 16:56:10 +0000 (16:56 +0000)]
Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev
Sheng-Hao Tsao [Thu, 10 Aug 2017 05:41:20 +0000 (13:41 +0800)]
Fix a bug that SurfaceView loses transformation
SurfaceView created for on-screen preview sometimes loses
transformation information in the Camera2 API with HALv1
environment, and therefore produced wrongly transformed frames.
It's because in RequestThreadManager.configureOutputs(), the
transformation set by LegacyCameraDevice.setSurfaceOrientation()
is cleared at mGLThreadManager.setConfigurationAndWait().
The bug is fixed by setting transformation information again
after mGLThreadManager.setConfigurationAndWait().
BUG=
63313861
TEST=Check on minnie with GCA and CameraIQTesting app. Preview always
displays correct transformation in Camera2<=>HALv1 environment.
Change-Id: Ic395047a120a21b3968dedb4314bdbe519c932e6
Mathieu Chartier [Fri, 11 Aug 2017 16:32:32 +0000 (16:32 +0000)]
Merge "Add dirty_image_objects file." into oc-mr1-dev
Shuzhen Wang [Fri, 11 Aug 2017 16:11:23 +0000 (09:11 -0700)]
Camera2: Legacy: Add onRequestQueueEmpty callback
onRequestQueueEmpty callback needs to be supported for legacy HAL1
devices.
Test: Camera CTS
Bug:
64483624
Change-Id: I268a1fe7577788c4e4e13dfecd7bb7abe0d82e6c
Tyler Gunn [Fri, 11 Aug 2017 16:24:41 +0000 (09:24 -0700)]
Catch BadParcelableException in RemoteConnection when setting extras.
Unlike the code in Telecom which can use Bundle.setDefusable(..), this
framework code is used within a Connection Manager's code space, so the
setDefusable method does not work.
To prevent crashing the Connection Manager's app, catching the exception
and ignoring extras in this case (not much else we can do).
I've also filed a bug against the offending component known for putting
bad parcelables into the extras.
Test: Modified code to force this scenario.
Bug:
64499462
Change-Id: If44ad2e2c8e285d513969c6babe5a798242da53d
TreeHugger Robot [Fri, 11 Aug 2017 16:22:59 +0000 (16:22 +0000)]
Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev
Philipp Weiß [Fri, 11 Aug 2017 15:33:05 +0000 (15:33 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev
Julia Reynolds [Fri, 11 Aug 2017 15:26:04 +0000 (11:26 -0400)]
Explicitly allow shell to update listener/assist
Oddly, this was flaky; sometimes shell could update
the entries
Fixes:
63793946
Test: cts
cts-tradefed run cts-dev --module DevicePolicyManager
--test com.android.cts.devicepolicy.ManagedProfileTest
cts-tradefed run cts-dev --module DevicePolicyManager --test
com.android.cts.devicepolicy.ManagedProfileTest
cts-tradefed run cts-dev --module DevicePolicyManager
--test com.android.cts.devicepolicy.ManagedProfileTest
Change-Id: I5cc6d6a49ad083e68cac1717f97b025966619102
Neil Fuller [Fri, 11 Aug 2017 12:22:36 +0000 (13:22 +0100)]
Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug:
64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit
8bb4140516c0e18d6c3cbb4215cedc306a2a6da9)
Julia Reynolds [Fri, 11 Aug 2017 13:05:20 +0000 (09:05 -0400)]
usb string update
Change-Id: Ib55ce7dbb0e9e5d25e01fd70b99cad5494cd619c
Fixes:
63157187
Test: make
Esteban Talavera [Fri, 11 Aug 2017 12:50:34 +0000 (12:50 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours
am:
b6ba151a6f -s ours
Change-Id: Ie26efb399e409d4ca90b434f9dbe6ee648d08c36
Esteban Talavera [Fri, 11 Aug 2017 12:34:00 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3 -s ours
Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
TreeHugger Robot [Fri, 11 Aug 2017 12:10:46 +0000 (12:10 +0000)]
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 10:42:24 +0000 (10:42 +0000)]
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
phweiss [Wed, 5 Jul 2017 16:54:54 +0000 (18:54 +0200)]
Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.
Bug:
63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
(cherry picked from commit
679dc2492ce1286a44c9dcd60e18dc97dd886a0a)
TreeHugger Robot [Fri, 11 Aug 2017 03:00:21 +0000 (03:00 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev
Nate Fischer [Thu, 10 Aug 2017 06:02:36 +0000 (23:02 -0700)]
WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API
This adds a dedicated API for fetching a URL for the Safe Browsing
reporting privacy policy.
This URL should be displayed by applications on custom Safe Browsing
interstitials.
Bug:
64077668
Test: make update-api (it compiles and javadocs look good)
Change-Id: I2873260edcaa924e68517c8679079e147b9995f4
TreeHugger Robot [Fri, 11 Aug 2017 01:28:01 +0000 (01:28 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am:
cad75e2437
Change-Id: Ib609a68d8da9eab5e4993565c61aec9ea6b1ba35
Sudheer Shanka [Fri, 11 Aug 2017 01:05:43 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 01:01:58 +0000 (01:01 +0000)]
Merge "FP permission checks should not crash system process" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 00:59:08 +0000 (00:59 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
Christofer Åkersten [Thu, 10 Aug 2017 23:04:48 +0000 (08:04 +0900)]
Remove preloaded media route resources
Remove system preloads previously removed in ag/
2549555 and mistakenly
readded in merge ag/
2691682.
Bug:
64567067
Bug:
64534957
Change-Id: I707ebf9f998aaeb472e41ebde2802db3d3f20a4d
Test: build
Tomasz Wasilczyk [Thu, 10 Aug 2017 19:30:31 +0000 (12:30 -0700)]
Implement region guessing.
Bug: b/
64115131
Test: instrumentation
Change-Id: I80a03b4e8614de18cebd9c4bd1f5f9922b8da59b
Sudheer Shanka [Thu, 10 Aug 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev