OSDN Git Service
Adrian Roos [Fri, 16 Mar 2018 14:27:30 +0000 (14:27 +0000)]
Merge "DisplayCutout: Fix corner cutout issues in SystemUI" into pi-dev
Adam Newman [Fri, 16 Mar 2018 14:26:25 +0000 (14:26 +0000)]
Merge "Enable optional divider in AccessPointPreference" into pi-dev
Alan Viverette [Fri, 16 Mar 2018 13:53:46 +0000 (13:53 +0000)]
Merge "Restore "Update packages for 1.0.0-beta1"" into pi-dev
Adrian Roos [Fri, 16 Mar 2018 13:01:00 +0000 (13:01 +0000)]
Merge "DisplayCutout: Add corner cutout overlay" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 12:45:47 +0000 (12:45 +0000)]
Merge "Add uses of hidden APIs from vendor apps" into pi-dev
Jorim Jaggi [Fri, 16 Mar 2018 12:14:48 +0000 (12:14 +0000)]
Merge "Boost thread priorities when running recents anim" into pi-dev
Annie Meng [Fri, 16 Mar 2018 10:25:32 +0000 (10:25 +0000)]
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
David Brazdil [Tue, 13 Mar 2018 09:41:23 +0000 (09:41 +0000)]
Add uses of hidden APIs from vendor apps
These will move into the dark greylist once we remove the UI toast.
Merge them with light greylist for now.
Bug:
64382372
Bug:
74589747
Bug:
74588266
Bug:
74586173
Bug:
74586969
Test: make
Change-Id: I8c1d3b67b763e8b14a66874705ba7165cf421e72
Merged-In: I5d0ec308a0187d67df6d9a4f0778c9285dc1e2af
Hyundo Moon [Thu, 15 Mar 2018 05:00:07 +0000 (14:00 +0900)]
MediaSession2: Implement getPlayerState/Position/BufferedPosition
Bug:
74578458
Test: Passed CTS
Change-Id: If215e8e16bdce9fdc04ca18ed8d08ed374d13a98
Jaewan Kim [Fri, 16 Mar 2018 06:35:23 +0000 (06:35 +0000)]
Merge "MediaSession2: Implement PlaylistParams replacements" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 04:00:48 +0000 (04:00 +0000)]
Merge "Frameworks: Fix system server profiling" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 03:36:00 +0000 (03:36 +0000)]
Merge "Delay DropBox until SettingsProvider becomes ready" into pi-dev
Jaewan Kim [Wed, 14 Mar 2018 11:37:38 +0000 (20:37 +0900)]
MediaSession2: Implement PlaylistParams replacements
This includes following changes
- Remove PlaylistParams
- Implement PlaylistParams replacements. Here's the list.
- get/setShuffleMode()
- get/setRepeatMode()
- Note: Playlist metadata APIs are already submitted (b/
74174649)
Bug:
74116823, Bug:
74118768
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I0267ffeaf92257eb7b81ffc8b6a3f40b5a2f6f9c
TreeHugger Robot [Fri, 16 Mar 2018 03:00:44 +0000 (03:00 +0000)]
Merge "Change FUSE_MAX_WRITE's value to 128KB" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 02:57:51 +0000 (02:57 +0000)]
Merge "Fix buffer size check in replyRead" into pi-dev
Adam Newman [Fri, 9 Mar 2018 00:46:16 +0000 (16:46 -0800)]
Enable optional divider in AccessPointPreference
Create a new preference layout based on layout_preference_two_target
that will allow for the optional use of a second target with a ripple
animation that stops at the hairline divider as well as a toggle for the
hairline divider.
This will enable ConnectedAccessPointPreference to
display a split between the left and right half when a Captive Portal
signin is pending.
Bug:
63929546
Bug:
68031656
Test: make RunSettingsLibRoboTests
Test: manual testing with Captive Portal and normal WiFi networks.
Change-Id: I5c8c513290ed04a8dcc38c3f9d6c149c9cca08aa
(cherry picked from commit
c0a8276d9ffd8177c11c74ec4366e9d1d3546e73)
Rob Carr [Fri, 16 Mar 2018 02:41:13 +0000 (02:41 +0000)]
Merge "Ensure Surface is recreated if children are detached." into pi-dev
Jaewan Kim [Fri, 16 Mar 2018 02:32:44 +0000 (02:32 +0000)]
Merge "MediaSession2: Remove MediaSession2#registerPlayerEventCallback()" into pi-dev
Jaewan Kim [Fri, 16 Mar 2018 02:31:36 +0000 (02:31 +0000)]
Merge "MediaSession2: Remove onPlaylistChanged() without metadata" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 02:30:12 +0000 (02:30 +0000)]
Merge "Add phenotype flag to disable battery saver tron log" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 02:14:51 +0000 (02:14 +0000)]
Merge "Fix resetting of wallpaper offset." into pi-dev
Peiyong Lin [Fri, 16 Mar 2018 02:05:01 +0000 (02:05 +0000)]
Merge "Replace android_color_mode usage with ColorMode." into pi-dev
Jaewan Kim [Thu, 15 Mar 2018 07:16:51 +0000 (16:16 +0900)]
MediaSession2: Remove MediaSession2#registerPlayerEventCallback()
Bug:
74157064
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ia976c0ebe9f2b7eff0ae603db96ab106aa045cbc
TreeHugger Robot [Fri, 16 Mar 2018 01:58:23 +0000 (01:58 +0000)]
Merge "Use the correct prebuilts for lifecycles." into pi-dev
Jaewan Kim [Thu, 15 Mar 2018 07:10:34 +0000 (16:10 +0900)]
MediaSession2: Remove onPlaylistChanged() without metadata
Bug:
74174728
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: I84495aa19bc03009c81cdefdf8e65fbff4b7bcb6
TreeHugger Robot [Fri, 16 Mar 2018 01:44:32 +0000 (01:44 +0000)]
Merge "Update USB charging strings" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 01:41:54 +0000 (01:41 +0000)]
Merge "Bump activity stop timeout past ANR timeout." into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 01:08:06 +0000 (01:08 +0000)]
Merge "Update JNI to call captureChildLayers" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 01:07:09 +0000 (01:07 +0000)]
Merge "Protecting against trying to launch apps that don't exist" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev
Hyundo Moon [Fri, 16 Mar 2018 00:18:41 +0000 (00:18 +0000)]
Merge "MediaSession2: Convert DataSourceDesc to MediaItem2 in MyPlayerEventCallback" into pi-dev
Makoto Onuki [Fri, 16 Mar 2018 00:04:34 +0000 (17:04 -0700)]
Add phenotype flag to disable battery saver tron log
- Also improve dumpsys power output.
Example:
===============================================================================
Battery saving stats:
Battery Saver state: OFF
Times enabled: 4
Drain stats:
Battery saver OFF ON
NonDoze NonIntr: 0m 0mAh( 0%) 0.0mAh/h 0m 0mAh( 0%) 0.0mAh/h
Intr: 0m 0mAh( 0%) 0.0mAh/h 0m 0mAh( 0%) 0.0mAh/h
Deep NonIntr: 0m 0mAh( 0%) 0.0mAh/h 0m 0mAh( 0%) 0.0mAh/h
Intr: 0m 0mAh( 0%) 0.0mAh/h 0m 0mAh( 0%) 0.0mAh/h
Light NonIntr: 0m 0mAh( 0%) 0.0mAh/h 0m 0mAh( 0%) 0.0mAh/h
Intr: 0m 0mAh( 0%) 0.0mAh/h 0m 0mAh( 0%) 0.0mAh/h
Battery saver policy (*NOTE* they only apply when battery saver is ON):
Settings: battery_saver_constants
value: send_tron_log=true
Settings: (overlay)
value:
vibration_disabled=true
animation_disabled=false
fullbackup_deferred=true
keyvaluebackup_deferred=true
firewall_disabled=false
datasaver_disabled=true
launch_boost_disabled=true
:
===============================================================================
Bug:
74742911
Fix:
75024658
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java
Test: Manual test with "settings put global battery_saver_constants send_tron_log=true" and
"settings put global battery_saver_constants send_tron_log=false" with
logcat | grep 'sysui_multi.*,1302,'
Change-Id: If0593273e21ace7899ac95642dc9feef2515eea1
TreeHugger Robot [Fri, 16 Mar 2018 00:11:53 +0000 (00:11 +0000)]
Merge "SliceManager: Relax explicit checks on map a little bit" into pi-dev
Robert Carr [Fri, 16 Mar 2018 00:03:55 +0000 (17:03 -0700)]
Fix resetting of wallpaper offset.
In the initial implementation I had hoped to eliminate
this call to set position, and when I had to add it back
I forgot to restore the wallpaper offseting. Anyway, setWallpaperOffset
sets this position and we need to make sure its not fighting with
setSurfaceBoundaries.
Bug:
74500386
Test: Manual. go/wm-smoke
Change-Id: Iac5d157090ea512acbe4892d57eee6e1e423f18d
TreeHugger Robot [Thu, 15 Mar 2018 23:41:53 +0000 (23:41 +0000)]
Merge "Set audio attrs on volume + home button vibrations" into pi-dev
Robert Carr [Thu, 15 Mar 2018 23:19:07 +0000 (16:19 -0700)]
Bump activity stop timeout past ANR timeout.
Once the activity stop timeout is triggered we may destroy
surfaces triggering native crashes. Imagine though an
app that hung in onStop, and then receives (and fails to handle)
an input event. Since the stop timeout was started before the hang
the stop timeout is very likely to trigger before the ANR timeout
leading to difficult to account for crashes. By the same logic we
bump the toast removal timeout.
Test: Feed it to the monkeys.
Bug:
62536731
Change-Id: I8e357271cfaa9f4077bb5bc92fdbd4584a425e8b
TreeHugger Robot [Thu, 15 Mar 2018 23:16:47 +0000 (23:16 +0000)]
Merge "[UI Tweak] Move PIN eSIM error message button position" into pi-dev
Wyatt Riley [Thu, 15 Mar 2018 23:06:06 +0000 (23:06 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev am:
38860f2cab am:
4b8765ff4a
am:
3b0285794a
Change-Id: I401b79bd0df7cf4e3b423edd70806f2ed7b3d7ea
TreeHugger Robot [Thu, 15 Mar 2018 22:57:09 +0000 (22:57 +0000)]
Merge "Removes stats_log proto from uid map in statsd." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 22:54:49 +0000 (22:54 +0000)]
Merge "MediaPlayer2Impl: fix null object reference." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 22:52:39 +0000 (22:52 +0000)]
Merge "Adding size suffix to diskstats fields." into pi-dev
Jorim Jaggi [Thu, 15 Mar 2018 19:16:15 +0000 (20:16 +0100)]
Boost thread priorities when running recents anim
To improve scheduling in WM to improve latency.
Bug:
73651529
Test: go/wm-smoke
Test: Trace swiping up, make sure threads have right priority
Change-Id: Ic35c00b70be4877abfe07de4ba1f18648cabd812
Andreas Gampe [Thu, 15 Mar 2018 06:13:28 +0000 (23:13 -0700)]
Frameworks: Fix system server profiling
Avoid a race to close the profiling file descriptor.
(cherry picked from commit
5a8ea8c619132b48d279be5fd7761538caf02ec9)
Bug:
74883338
Test: m
Test: am profile start `pid system_server` /data/local/tmp/test.trace && sleep 5s && am profile stop `pid system_server` && adb pull /data/local/tmp/test.trace && [[ $(find test.trace -size +1K) ]] && echo Success
Merged-In: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
Change-Id: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
TreeHugger Robot [Thu, 15 Mar 2018 22:46:47 +0000 (22:46 +0000)]
Merge "Fix uid for AppBreadcrumbReported for 3p app" into pi-dev
Wyatt Riley [Thu, 15 Mar 2018 22:27:50 +0000 (22:27 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev am:
38860f2cab
am:
4b8765ff4a
Change-Id: Ib91a39ae254922ae56b2911c29b86679d4dd16fb
TreeHugger Robot [Thu, 15 Mar 2018 22:17:22 +0000 (22:17 +0000)]
Merge "camera2: Add links for aeState" into pi-dev
Wyatt Riley [Thu, 15 Mar 2018 22:14:04 +0000 (22:14 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev
am:
38860f2cab
Change-Id: Ief795f6cc13f5877acf0550a144c7f16aaa9a934
Yi Jin [Thu, 15 Mar 2018 22:09:46 +0000 (22:09 +0000)]
Merge "Remove comments of privacy.proto to avoid this accidently go to AOSP" into pi-dev
Marco Nelissen [Thu, 15 Mar 2018 22:05:35 +0000 (22:05 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef am:
957e6ff8fe -s ours am:
10dd321343 -s ours
am:
9dadab0c7c -s ours
Change-Id: Id212aa1da51bd755ff548abb1067078e661ab674
Yi Jin [Tue, 13 Mar 2018 22:01:00 +0000 (15:01 -0700)]
Remove comments of privacy.proto to avoid this accidently go to AOSP
Bug:
72950747
Test: manual
Change-Id: I06a897170996fc0aa493bda76495c6ef1e484961
Marco Nelissen [Thu, 15 Mar 2018 21:57:27 +0000 (21:57 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef am:
957e6ff8fe -s ours
am:
10dd321343 -s ours
Change-Id: I1b97c296b4e205f22eef83a34512bd16e8b6464a
Kevin Neas [Tue, 13 Mar 2018 00:36:23 +0000 (17:36 -0700)]
Protecting against trying to launch apps that don't exist
BUG:
74083361
Change-Id: Ia0750bcca2534e794a81f094d5c214af4011c0ce
Test: Locally
(cherry picked from commit
cb45b97a539a6460af1ecb43ddc3bf574f8100a9)
Jason Monk [Thu, 15 Mar 2018 21:48:47 +0000 (17:48 -0400)]
SliceManager: Relax explicit checks on map a little bit
Test: manual
Bug:
68378561
Change-Id: Iaf7e296dfd7dd355ca755386d1e2fb7b220abc15
Chong Zhang [Thu, 15 Mar 2018 21:46:42 +0000 (21:46 +0000)]
Merge "update OWNERS Bug:
63633199 Change-Id: I538ca012b68e27106fee8924f588a9fc1aef88f8" into pi-dev
Chong Zhang [Thu, 15 Mar 2018 21:42:37 +0000 (14:42 -0700)]
update OWNERS
Bug:
63633199
Change-Id: I538ca012b68e27106fee8924f588a9fc1aef88f8
TreeHugger Robot [Thu, 15 Mar 2018 21:40:32 +0000 (21:40 +0000)]
Merge "fix slow get caps -- DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]
Merge changes from topic "am-
4832db20-4618-4c51-930c-
c4179c7f0a1b" into oc-dev
* changes:
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped:
3656457fac skipped:
d3ef137680
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped:
3656457fac
DO NOT MERGE: Restoring Network Available Notification to AGnssRil
Robert Carr [Thu, 15 Mar 2018 21:34:45 +0000 (14:34 -0700)]
Ensure Surface is recreated if children are detached.
If we detach the children of a Surface, then they are stuck
around indefinitely and we can't use the Surface as the result
of a future call to lay-out visible. This should also improve
Surface lifetime-errors as now in the case of cancelling
an exit animation we will fall in to this preserve surface
codepath instead of the destroySurfaceUnchecked block in
WindowStateAnimator#cancelExitAnimationForNextAnimationLocked.
Bug:
68996752
Bug:
62536731
Bug:
72921025
Bug:
72873272
Change-Id: Ib0be6e7447c04d00bff8784d8b8072918d48e0ba
Doris Ling [Thu, 15 Mar 2018 21:28:33 +0000 (14:28 -0700)]
Use the correct prebuilts for lifecycles.
The previous change has been reverted due to the proguard issue. That
has been fixed, and we should now re-apply this change.
Change-Id: I2ea5573284488bc0cb3871d4b36221a79fe28181
Fixes:
74834445
Test: make RunSettingsRoboTests
Marco Nelissen [Thu, 15 Mar 2018 21:26:48 +0000 (21:26 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef
am:
957e6ff8fe -s ours
Change-Id: I0eed35a22a6e3186d8dc37fb2bae76fcbbe0d5ff
TreeHugger Robot [Thu, 15 Mar 2018 21:26:24 +0000 (21:26 +0000)]
Merge "Move computation of decodeColor- Type and Space" into pi-dev
Yi Jin [Thu, 15 Mar 2018 21:25:59 +0000 (21:25 +0000)]
Merge "Fix bug to break switch cases." into pi-dev
Yi Jin [Thu, 15 Mar 2018 21:14:26 +0000 (14:14 -0700)]
Fix bug to break switch cases.
Bug:
75001195
Test: N/A
Change-Id: I99274cbf34d191c25ad9ced08f999c59f922cb25
Alan Viverette [Thu, 15 Mar 2018 21:19:36 +0000 (21:19 +0000)]
Restore "Update packages for 1.0.0-beta1"
This reverts commit
f980f54a758d24398bba142481b482b6f164c3b9.
Bug:
74950017
Test: manual
Change-Id: I793ec0f6c2ba6a141481f8d03e85b791dd8a73d1
Dongwon Kang [Wed, 14 Mar 2018 22:22:23 +0000 (15:22 -0700)]
Remove unnecessary static libraries in libmedia2_jni
Test: build
Bug:
63934228
Change-Id: I146ee62e78cf2d3348e624f61a1c3328820bd763
Peiyong Lin [Thu, 15 Mar 2018 00:29:10 +0000 (17:29 -0700)]
Replace android_color_mode usage with ColorMode.
To ease the pain when we add color mode v1.1, we want to replace all
android_color_mode usage in framework native with ColorMode directly from HAL.
This patch cleans up usage in framework base because of the APIs call into
framework native gui.
BUG:
73824924
Test: Build & flash
Change-Id: I0f7af4cc41b832e977c15041de200733ca853cfe
TreeHugger Robot [Thu, 15 Mar 2018 21:10:21 +0000 (21:10 +0000)]
Merge "DndTile includes secondary label in content descr." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 21:07:13 +0000 (21:07 +0000)]
Merge "Adding IntDef annotations to some flag based properties" into pi-dev
Makoto Onuki [Thu, 15 Mar 2018 21:01:49 +0000 (21:01 +0000)]
Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev
Jerry Zhang [Thu, 15 Mar 2018 19:29:03 +0000 (12:29 -0700)]
Update USB charging strings
Fixes:
74405634
Test: n/a
Change-Id: I099e698d6dbbad132ab234fba4e2b2e1b6142464
TreeHugger Robot [Thu, 15 Mar 2018 20:52:09 +0000 (20:52 +0000)]
Merge "Improved Field Classification edit distance algorithms." into pi-dev
Robert Carr [Wed, 7 Mar 2018 22:08:09 +0000 (14:08 -0800)]
Update JNI to call captureChildLayers
All current usage of captureChildLayers prefers this variant.
Bug:
72760590
Test: Manual, go/wm-smoke, screenshots work.
Change-Id: I5e53e8a01877f8e2e7efcde3384afee961e43e42
Kweku Adams [Thu, 15 Mar 2018 18:29:42 +0000 (11:29 -0700)]
Adding size suffix to diskstats fields.
This is to follow the stated style convention.
Bug:
74975371
Test: flash device and check incident output
Change-Id: Ic4282f2e623999f4d7795c4932d5faf10280c3c6
David Chen [Thu, 15 Mar 2018 01:36:45 +0000 (18:36 -0700)]
Removes stats_log proto from uid map in statsd.
We don't need to parse the proto of uid map, so we use the
ProtoOutputStreame class to generate the binary form of the proto
output that's needed for parsing the uid map data.
Test: Verified unit-tests still pass.
Bug:
74010813
Change-Id: Ia2f7572f3b78bb6f7b60e8b14cf5d65428469ab6
TreeHugger Robot [Thu, 15 Mar 2018 20:32:27 +0000 (20:32 +0000)]
Merge "Delete secondary text in charging animation" into pi-dev
Etan Cohen [Thu, 15 Mar 2018 20:26:13 +0000 (20:26 +0000)]
Merge "[AWARE] Metrics for Discovery + Ranging" into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 20:11:37 +0000 (20:11 +0000)]
Merge "Add uses on marlin to hidden API light greylist" into pi-dev
Adrian Roos [Thu, 15 Mar 2018 19:09:42 +0000 (20:09 +0100)]
DisplayCutout: Add corner cutout overlay
Bug:
74982138
Test: mmm packages/overlays/DisplayCutoutEmulationCornerOverlay/
Change-Id: I06258f417b4ce3b1cc65e046fb18bc856de896c9
Mike Digman [Thu, 15 Mar 2018 20:06:53 +0000 (20:06 +0000)]
Merge "Add rotation logs to help debug bug reports" into pi-dev
Adrian Roos [Thu, 15 Mar 2018 20:06:37 +0000 (21:06 +0100)]
DisplayCutout: Fix corner cutout issues in SystemUI
Bug:
74195186
Test: Turn on Corner Display Cutout, verify SystemUI nowhere gets obscured by the cutout.
Change-Id: I27eeca067fdf65f5fa1570057b7f23157708d65c
Mike Digman [Thu, 15 Mar 2018 20:06:19 +0000 (20:06 +0000)]
Merge "Update rotate navbar icon to Google Material spec" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 20:04:22 +0000 (20:04 +0000)]
Merge "Revert "Update packages for 1.0.0-beta1"" into pi-dev
Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:14 +0000 (20:00 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855 skipped:
1160018fef
Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f
Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:09 +0000 (20:00 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2 am:
c077fab855
Change-Id: Ia2f661ae02c925da5d6e05f96983cc3f606cd9bd
Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:04 +0000 (20:00 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f am:
6100f6d3b2
Change-Id: I6388ec63ab6d29d1b002cc296571e67278245fc0
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:59 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d am:
31ee079d5f
Change-Id: I3a801f0e6cadeb98e28d91c52062e6e63164bca2
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:54 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca am:
4ef2cbc58d
Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:42 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923 skipped:
9d13b0f6ca
Change-Id: Ib29c785708e959391b3e388b453147e94037420f
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644 am:
019eec3923
Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:32 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38 am:
b8dad6c644
Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603
Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:26 +0000 (19:59 +0000)]
[automerger] DO NOT MERGE Rework thumbnail cleanup am:
b514ce9b38
Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608
Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]
DO NOT MERGE Rework thumbnail cleanup
Bug:
63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
TreeHugger Robot [Thu, 15 Mar 2018 19:56:39 +0000 (19:56 +0000)]
Merge "Don't throw but wtf to help chase mismatched start/finish op calls" into pi-dev
John Reck [Thu, 15 Mar 2018 19:48:54 +0000 (19:48 +0000)]
Merge "Break down jank between frame drops vs. triple buffered" into pi-dev
Antoan Angelov [Thu, 15 Mar 2018 19:40:13 +0000 (19:40 +0000)]
Merge "Move the support_transfer_ownership_metadata inside the device admin descriptor XML." into pi-dev
TreeHugger Robot [Thu, 15 Mar 2018 19:39:03 +0000 (19:39 +0000)]
Merge "Improve efficiency for CpuTimePerUidFreq" into pi-dev
Todd Kennedy [Thu, 15 Mar 2018 19:28:33 +0000 (19:28 +0000)]
Merge "Fix instant app filter" into pi-dev
Todd Kennedy [Wed, 14 Mar 2018 15:14:23 +0000 (08:14 -0700)]
Fix instant app filter
There were two bugs in the filtration:
1) An instant app could query for activity info in another
instant app
2) An instant app could query for activity info from a full
app if the activity was implicitly exposed by having
a VIEW/BROWSABLE intent filter
Fixes:
74986543
Test: atest -it CtsAppSecurityHostTestCases:EphemeralTest#testActivityInfo
Change-Id: I89b2fb661b13b8e8a8abc6f980d9c56eb4d692b7
(cherry picked from commit
9c72a974224a931f093cdba59abc8627570b3aeb)
Sunny Goyal [Thu, 15 Mar 2018 19:00:26 +0000 (12:00 -0700)]
Adding IntDef annotations to some flag based properties
Bug:
74408961
Test: N/A
Change-Id: I4320c5e265b52338eb2f4b2e5ea80ea05b9ca28f
Beverly [Thu, 15 Mar 2018 18:50:40 +0000 (14:50 -0400)]
DndTile includes secondary label in content descr.
On talkback, user will be able to hear the secondary label
for DND now.
Test: manual
Change-Id: Iaef1e568d8b5f466f0b2352cf648fb43ef1bc64a
Fixes:
74946051