OSDN Git Service
TreeHugger Robot [Wed, 18 Oct 2017 13:20:43 +0000 (13:20 +0000)]
Merge "Fix incorrect colors for CustomTile in QS" into oc-mr1-dev
TreeHugger Robot [Wed, 18 Oct 2017 00:51:00 +0000 (00:51 +0000)]
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
Adam Lesinski [Fri, 13 Oct 2017 19:40:37 +0000 (12:40 -0700)]
AAPT2: Flatten AndroidManifest.xml stringpool in UTF16
A few OEM devices have introduced a memory corruption bug
that is only triggered when an application's AndroidManifest.xml
uses UTF8 string pools. Workaround this by only encoding
AndroidManifest.xml with UTF16 strings.
Bug:
64434571
Test: manual
Change-Id: I2ee50d1b2b5942d971ef2a544c878de63f67c652
Winston Man [Tue, 17 Oct 2017 20:24:31 +0000 (21:24 +0100)]
Update build target to restrict it to arm and x86 only
This is to address build breakage for MIPS
https://android-build.googleplex.com/builds/submitted/
4400887/sdk_phone_mips-sdk_mac/latest/logs
Bug:
64504762
Test: build successful with target marlin-eng (arm), gce_x86_phone (x86) and sdk_phone_mips (mips)
Change-Id: I710c823ae235d0650b4d1a018180b552261aecc5
TreeHugger Robot [Tue, 17 Oct 2017 20:02:19 +0000 (20:02 +0000)]
Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev
Evan Laird [Tue, 17 Oct 2017 20:00:29 +0000 (16:00 -0400)]
Fix incorrect colors for CustomTile in QS
Add support for Supplier<Icon> in QSTile.State, allowing a method for
CustomTile not to cache the drawable for its IconViews. This fixes the
problem that the ImageViews in QQS and QS were trying to use the same
drawable and putting it in a bad state.
Test: Add 3rd party tile to first position in QS and turn on/off; visual
Change-Id: I408d6391a718fcb3f847e72bd303551d2d004dbb
Fixes:
67356768
Winston Man [Tue, 17 Oct 2017 17:33:50 +0000 (17:33 +0000)]
Merge "Update pre-built apks in platform" into oc-mr1-dev
Winston Man [Mon, 16 Oct 2017 09:33:03 +0000 (10:33 +0100)]
Update pre-built apks in platform
Now include arm and x86 apks from built server
CtsShim (8.1.0-
4396705)
./packages/CtsShim/apk/arm/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/arm/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/x86/CtsShim.apk
package: name='com.android.cts.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
./packages/CtsShim/apk/x86/CtsShimPriv.apk
package: name='com.android.cts.priv.ctsshim'
versionCode='27'
versionName='8.1.0-
4396705'
platformBuildVersionName='8.1.0'
sdkVersion:'24'
targetSdkVersion:'24'
Built here:
https://android-build.googleplex.com/builds/branch-dashboard/ub-ctsshim-dev?build_id=
4396705
Final OC-MR1 drop for Oct 19th.
This build IS suitable for public release.
Bug:
64504762
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Change-Id: I9a439f7287a8d3703cf014c7c03df2348a384a80
Mathieu Chartier [Tue, 17 Oct 2017 16:35:38 +0000 (16:35 +0000)]
Merge "DO NOT MERGE: Add extra compiled classes" into oc-mr1-dev
Zhi An Ng [Mon, 16 Oct 2017 23:03:22 +0000 (23:03 +0000)]
DO NOT MERGE Revert "Show dialog if top app is killed by lmk"
This reverts commit
84a2e2a06bb95e9c30f10a77d0fb90386b0f470d.
Comments in ag/
3029299 for more details. This revert is dependent on another revert ag/
3074066, which has been merged.
Reason for revert: No mechanism to check if an app is killed because of low memory killer
Bug:
65488249
Test: manual
Change-Id: I2940a5b9f22f3428432537acbf64a10f81b0b9d0
Siyamed Sinir [Tue, 17 Oct 2017 01:11:57 +0000 (01:11 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into oc-mr1-dev
TreeHugger Robot [Mon, 16 Oct 2017 23:00:29 +0000 (23:00 +0000)]
Merge "Revert "Only show dialog if top app is killed"" into oc-mr1-dev
Mathieu Chartier [Mon, 16 Oct 2017 17:54:56 +0000 (10:54 -0700)]
DO NOT MERGE: Add extra compiled classes
Since compiled were not updated for MR1, this change incrementally
adds missing classes based on the typical use cases.
The reason that we only use boot image profiles in MR1 for Go is
because of risk concerns.
Generated with a threshold of 3.
Bug:
67730245
Test: make and flash
Change-Id: I9597bcec521514fdbf69521ef0e23a2d7ddcf656
TreeHugger Robot [Mon, 16 Oct 2017 21:33:03 +0000 (21:33 +0000)]
Merge "Move stub APK profile logic to performDexOptUpgrade" into oc-mr1-dev
Zhi An Ng [Mon, 16 Oct 2017 20:38:00 +0000 (20:38 +0000)]
Revert "Only show dialog if top app is killed"
This reverts commit
90024acefeed782ff89a6004802715529d5a189d.
Commens in ag/
3029299 for more details.
After this is reverted, ag/
2891284 will need to be reverted (for oc-mr1-dev),
and ag/
2961224 for master).
Reason for revert: No mechanism to check if an app is killed because of low memory killer
Change-Id: I4aeef4f3008280a34f0b898ed7a2da37be006a84
Bug:
65488249
TreeHugger Robot [Mon, 16 Oct 2017 19:37:31 +0000 (19:37 +0000)]
Merge "Auto-dim refinements" into oc-mr1-dev
TreeHugger Robot [Mon, 16 Oct 2017 18:56:49 +0000 (18:56 +0000)]
Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev
Mathieu Chartier [Mon, 16 Oct 2017 17:49:09 +0000 (17:49 +0000)]
Merge "Add dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev
Fyodor Kupolov [Thu, 12 Oct 2017 18:22:57 +0000 (11:22 -0700)]
Use calling user ID when calling isDeviceLocked
If isDeviceLocked is called with clearCallingIdentity,
original userId should be explicitly passed
Bug:
67621847
Test: Manual
Change-Id: I2bcb92572898811cc96bda1149ef806e6239e929
Jason Monk [Fri, 13 Oct 2017 14:34:40 +0000 (10:34 -0400)]
Auto-dim refinements
- Don't auto-dim while wallpaper is showing
- Up alpha to 60%
Change-Id: Ie5fc33279ca46f7de37befacbbd7b42b7d4e5d15
Fixes:
67735001
Test: manual
Bill Yi [Mon, 16 Oct 2017 06:07:55 +0000 (06:07 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours am:
7e3f20e249 -s ours
am:
b597ff837c -s ours
Change-Id: I4372cfb4a6dc243e9915d40f147a38119e4d1666
Bill Yi [Mon, 16 Oct 2017 05:59:25 +0000 (05:59 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours am:
43b03fbacf -s ours
am:
7e3f20e249 -s ours
Change-Id: I81957a7142c7ee4f702e4895bdfebdb190750367
Bill Yi [Mon, 16 Oct 2017 05:48:58 +0000 (05:48 +0000)]
Import translations. DO NOT MERGE am:
b081f1e809 -s ours
am:
43b03fbacf -s ours
Change-Id: If3ad876fdb726d199a8ccc26a1808f358377e44b
Bill Yi [Mon, 16 Oct 2017 05:41:21 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
b081f1e809 -s ours
Change-Id: I8589e76f2f5197beefddb2027261e290932d268f
Mathieu Chartier [Mon, 16 Oct 2017 04:13:28 +0000 (21:13 -0700)]
Add dalvik.vm.foreground-heap-growth-multiplier property
Corresponds to the -XX:ForegroundHeapGrowthMultiplier ART option.
Bug:
67416130
Test: make, flash, setprop
Change-Id: Ia9c70c62d8faa3b9aeb7b50dba237095abd53e80
Bill Yi [Sun, 15 Oct 2017 20:13:44 +0000 (13:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id17cd2d22442f7bf1221be8f98164189757695a4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Pankaj Kanwar [Sun, 15 Oct 2017 04:03:46 +0000 (04:03 +0000)]
Merge "Add CarrierConfig for Invalid Call Forwarding number" into oc-mr1-dev
Mathieu Chartier [Fri, 13 Oct 2017 22:28:23 +0000 (22:28 +0000)]
Merge "Add property reading logic for dalvik.vm.madvise-random" into oc-mr1-dev
TreeHugger Robot [Fri, 13 Oct 2017 20:22:56 +0000 (20:22 +0000)]
Merge "Update CtsShim with multiArch" into oc-mr1-dev
Winston Man [Tue, 5 Sep 2017 14:12:35 +0000 (15:12 +0100)]
Update CtsShim with multiArch
Add an empty .so to CTS for testing multiArch upgrade
Pre-built apk will be updated separately after this is merged
Testing build command will be updated later
Bug:
64504762
Test: all related cts and gts pass
Test: pre-built passed on all arch, including x86_64
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Change-Id: I5abfe06de0bd730b5cdc317df344b7567d50aff6
Zhi An Ng [Fri, 13 Oct 2017 20:08:49 +0000 (20:08 +0000)]
Merge "Only show dialog if top app is killed" into oc-mr1-dev
Mathieu Chartier [Fri, 13 Oct 2017 18:29:27 +0000 (11:29 -0700)]
Add property reading logic for dalvik.vm.madvise-random
The property is passed to runtime init as
-XX:MadviseRandomAccess.
Bug:
67772594
Test: make and getprop
Change-Id: I7cbab5d028067810276bc58c312806ea3785f93f
TreeHugger Robot [Fri, 13 Oct 2017 18:25:51 +0000 (18:25 +0000)]
Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev
Andrii Kulian [Tue, 10 Oct 2017 07:41:41 +0000 (00:41 -0700)]
DO NOT MERGE: Don't let keyguard to influence orientation when dismissing
When keyguard is being dismissed it still was overriding orientation
for the display, which caused report of wrong configuration to
activity that was becoming visible.
Bug:
66979760
Bug:
36897968
Bug:
62796190
Bug:
62904487
Bug:
38494778
Test: Launch Unity 4 based game, lock and unlock screen, check UI
Test: com.android.server.wm.DisplayContentTests#testOrientationDefinedByKeyguard
Change-Id: I0a180b8e941a85ba4174a40cdec2ff0b8f3e00eb
Mathieu Chartier [Fri, 13 Oct 2017 16:25:23 +0000 (16:25 +0000)]
Merge "Add android.os.Parcel$ReadWriteHelper to compiled classes" into oc-mr1-dev
Abodunrinwa Toki [Tue, 19 Sep 2017 22:18:40 +0000 (23:18 +0100)]
Flags to enable/disable smart selection in EditText
1. smart_selection_enabled_for_edit_text
Disables smart selection for editable text.
2. smart_selection_dark_launch
Dark launch TextClassifierImpl.suggestSelection(...)
In this mode we run the method, but never change the user's
selection to measure the quality of the results based on what
the user actually wanted.
Bug:
65959640
Test: Manually tested flags turn on/off feature with 'adb shell
settings put global' and GServices override.
Test: bit FrameworksCoreTests:android.provider.SettingsBackupTest
Merged-In: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
Change-Id: Iacc561c8ee004b0123de66ad1ee06b1f56b4e4b4
Patrik Torstensson [Fri, 13 Oct 2017 01:30:40 +0000 (01:30 +0000)]
Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev
Robert Benea [Thu, 5 Oct 2017 01:28:01 +0000 (18:28 -0700)]
Incorporate slab reclaimable into meminfo
Instead of using the whole slab mem for kernel usage, split the
unreclaimable to kernel and reclaimable to cache (since is freed
under mem. pressure).
Test: tested on gobo
Bug:
67753120
Change-Id: I0f5a310bb88603ad7bb28e5398ea57c249c04fc2
Pankaj Kanwar [Fri, 13 Oct 2017 00:26:11 +0000 (00:26 +0000)]
Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 23:58:02 +0000 (23:58 +0000)]
Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev
Mathieu Chartier [Thu, 12 Oct 2017 23:21:29 +0000 (16:21 -0700)]
Add android.os.Parcel$ReadWriteHelper to compiled classes
Add this class to compiled classes since its important for app
startup.
Test: make and look at oatdump
Bug:
67730245
Change-Id: I401ef516af076aeae56349a2317e63cca0eb4d47
Ng Zhi An [Sat, 7 Oct 2017 00:17:11 +0000 (17:17 -0700)]
Only show dialog if top app is killed
This changes the check from only looking at the
app's curSchedGroup to checking if the app that is
killed matches the current top app (retrieved
using resumedAppLocked)
Bug:
67513077
Bug:
67416130
Test: manual
Change-Id: Idda4c4b21081737ee3ab2101a8cf2a94f0d8df23
Mathieu Chartier [Thu, 12 Oct 2017 20:55:31 +0000 (13:55 -0700)]
Move stub APK profile logic to performDexOptUpgrade
It used to be done in decompressPackage but this was too early during
first boot and caused an error copying since the profile directories
were not set up yet.
Test: flash with wipe, confirm profile is used
Bug:
64550394
Change-Id: If06c30f3f74ab172b0e7d57998cda73de9bbdcc4
Brad Ebinger [Thu, 12 Oct 2017 20:58:55 +0000 (13:58 -0700)]
Add CarrierConfig for Invalid Call Forwarding number
In some situations, an invalid Call Forwarding number
from a carrier's network can cause the modem to send back
invalid characters instead of a number.
This change adds a carrier config option to replace the invalid
text with "Voicemail" in the Call Forwarding settings when
it is received from the network.
Bug:
67267077
Test: Manual
Change-Id: I26f9b80487f92340d1df2cf22bb5a616edcbdebf
Abodunrinwa Toki [Thu, 12 Oct 2017 20:20:16 +0000 (21:20 +0100)]
DO NOT MERGE Turn off logcat logging for smart selection logs.
Bug:
64914512
Test: none
Change-Id: Ia85f021171a40ebc58bd98020626911961055302
Winson Chung [Thu, 12 Oct 2017 20:34:16 +0000 (20:34 +0000)]
Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 01:47:26 +0000 (01:47 +0000)]
Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 01:24:48 +0000 (01:24 +0000)]
Merge "Don't recycle replaced nodes in a11y cache" into oc-mr1-dev
Hall Liu [Wed, 11 Oct 2017 23:53:11 +0000 (23:53 +0000)]
Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev
Siddharth Ray [Tue, 3 Oct 2017 00:30:58 +0000 (17:30 -0700)]
Cleanup of Cellular/Wifi aggregate statistics
Cleanup of Cellular/Wifi aggregate statistics in Batterystats dumpsys
Cellular
- Modification of field names to improve clarity
- Removed count "x" values
- Added power values to Rx signal strength
- Added power values to Tx power
- Added "Cellular Sleep time"
- Removed erroneous battery field (This is being fixed in b/
67213886,
b/
67213967)
- Removed the following fields (Mobile radio active unknown time, Mobile
radio active adjusted time, Signal scanning time)
Wifi
- Modification of field names to improve clarity
- Removed count "x" values
- Added power values to Rx signal strength
- Removed the following field (Wifi on, Wifi running)
BUG:
67322291
Change-Id: I9630f154a73c7e3cb4bae4779609302f3674602f
Jeff Sharkey [Wed, 11 Oct 2017 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976
am:
753a9ab308
Change-Id: I32ca3f3a6ede37fdc2bd3ed1f03374b45cdb2697
Jeff Sharkey [Wed, 11 Oct 2017 22:51:51 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0
am:
e286f08000
Change-Id: Iefbf0c8df06d6cea71d7ccdcd65ff4156a156419
Phil Weaver [Wed, 11 Oct 2017 19:53:54 +0000 (12:53 -0700)]
Don't recycle replaced nodes in a11y cache
This is a patch for another bug. When the cache refreshes
nodes, it marks the transaction to bypass the cache. We
still, however, replace the cached node. If we recycle
the node as well, we end up refreshing it after it's been
recycled and end up with a sealed node in the cache. That
node can then be obtained and then throw an exception when
a setter is called. These exceptions are almost impossible
to debug.
I'm going to leave the bug open to roll this CL back and
fix the cache's behavior, but this fix seems safer this
late.
Bug:
35626351
Test: Ran a11y CTS and unit tests. Verified on instrumented
master build that the error indeed goes away. Removing one
line from unit tests that requires recycling.
Change-Id: Icc9a43ee49cf7c6bfa996839b35954faaf31621c
Jeff Sharkey [Wed, 11 Oct 2017 22:51:13 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours
am:
bbcb8e4976
Change-Id: I924de4599fbf76a83d06cc6e0982bd73067c033a
Jeff Sharkey [Wed, 11 Oct 2017 22:35:46 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours
am:
620c5cfda0
Change-Id: I07805d81dbcf65993d5dcb695d9877ad4a914bac
Jeff Sharkey [Wed, 11 Oct 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa
am:
d6e3d358d4 -s ours
Change-Id: Iece9faf3d2cbef432450c053d6440d94053bbb00
Jeff Sharkey [Wed, 11 Oct 2017 22:27:31 +0000 (22:27 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7
am:
92d80b72aa
Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf
Jeff Sharkey [Wed, 11 Oct 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6
am:
af93051ac4 -s ours
Change-Id: I93ce23ee4d45491a79346d11aed2cdb0fed0ef9f
Jeff Sharkey [Wed, 11 Oct 2017 22:12:39 +0000 (22:12 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224
am:
44adace6c6
Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c
Jeff Sharkey [Wed, 11 Oct 2017 22:11:57 +0000 (22:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb
am:
f1f2a61fb7
Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9
Jeff Sharkey [Wed, 11 Oct 2017 22:11:51 +0000 (22:11 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf
am:
a7f0504849
Change-Id: Ib17c9471d7f3bdde18e3de4ad693fd9ef5312059
Jeff Sharkey [Wed, 11 Oct 2017 22:00:35 +0000 (22:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853
am:
7512875224
Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec
Jeff Sharkey [Wed, 11 Oct 2017 21:52:08 +0000 (21:52 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours
am:
3b47256ccf
Change-Id: Ie321b5922ec83367ec93e528993fb205ebcad1ac
Jeff Sharkey [Wed, 11 Oct 2017 21:51:37 +0000 (21:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571
am:
300e6ffafb
Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f
Jeff Sharkey [Wed, 11 Oct 2017 21:41:50 +0000 (21:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7
am:
8860624853
Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17
Jeff Sharkey [Wed, 11 Oct 2017 21:38:30 +0000 (21:38 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3
am:
4a71a2daf6
Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c
Jeff Sharkey [Wed, 11 Oct 2017 21:34:52 +0000 (21:34 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours
am:
ba1f2d2571
Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5
Jeff Sharkey [Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a
am:
97f6a0da40 -s ours
Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74
Android Build Merger (Role) [Wed, 11 Oct 2017 21:26:04 +0000 (21:26 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c
am:
da3d10591a
Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b
Hall Liu [Wed, 11 Oct 2017 02:08:24 +0000 (19:08 -0700)]
Fix URI unparceling and clarify an error condition
Use the proper unparceling method for lists, add a more verbose
exception for when the app fails to declare a critical piece of
metadata.
Change-Id: I29d5291d7b88476496334d268be94f7f8c08255c
Fixes:
67640653
Test: manual, with testapp
Jeff Sharkey [Wed, 11 Oct 2017 21:24:00 +0000 (21:24 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours
am:
e9d2113af7
Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78
Jeff Sharkey [Wed, 11 Oct 2017 21:21:51 +0000 (21:21 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279
am:
3f671b3194
Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63
am:
8916c30c54 -s ours
Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
TreeHugger Robot [Wed, 11 Oct 2017 21:19:54 +0000 (21:19 +0000)]
Merge "Fix alarm preview volume" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:18:21 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours
am:
7f108b81b3
Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6
Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0
am:
72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
Jeff Sharkey [Wed, 11 Oct 2017 21:03:59 +0000 (21:03 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9
am:
98371ee7c9
Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5
Jeff Sharkey [Wed, 11 Oct 2017 21:00:20 +0000 (21:00 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2
am:
e1ae848970 -s ours
Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee
am:
e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c
am:
5d60a49d63
Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8
Jeff Sharkey [Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am:
31c5adc279
Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a
am:
4a60106aa0
Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c
Jeff Sharkey [Wed, 11 Oct 2017 20:47:31 +0000 (20:47 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c
am:
b4d23d55c2
Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7
Jeff Sharkey [Wed, 11 Oct 2017 20:46:21 +0000 (20:46 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours
am:
5f17a285f9
Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9
am:
d20cad62ee
Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
Jeff Sharkey [Wed, 11 Oct 2017 20:42:42 +0000 (20:42 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9
am:
7555eb508c
Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d
TreeHugger Robot [Wed, 11 Oct 2017 20:37:04 +0000 (20:37 +0000)]
Merge "Check target api version before crashing apps." into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:34:50 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am:
9d3706046c
Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef
Jeff Sharkey [Wed, 11 Oct 2017 20:34:48 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am:
254369967a
Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
TreeHugger Robot [Wed, 11 Oct 2017 20:34:39 +0000 (20:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
04b96d76a9
Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
Jeff Sharkey [Wed, 11 Oct 2017 20:31:35 +0000 (20:31 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
d87d2746a9
Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23
Jeff Sharkey [Wed, 11 Oct 2017 20:30:25 +0000 (20:30 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am:
09984216e6 -s ours
Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120
TreeHugger Robot [Wed, 11 Oct 2017 20:23:53 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:23:33 +0000 (20:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:22:22 +0000 (20:22 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
Bill Yi [Wed, 11 Oct 2017 20:17:36 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
e721fbddb5 -s ours
am:
1018a5d4a1 -s ours
Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd
Bill Yi [Wed, 11 Oct 2017 20:09:44 +0000 (20:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e721fbddb5 -s ours
Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6
TreeHugger Robot [Wed, 11 Oct 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev