OSDN Git Service
Jeff Davidson [Fri, 16 Mar 2018 23:48:51 +0000 (23:48 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 23:30:49 +0000 (23:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Robert Berry [Fri, 16 Mar 2018 23:13:53 +0000 (23:13 +0000)]
Merge "Create snapshot even if no PendingIntent is registered" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 22:59:32 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 22:40:46 +0000 (22:40 +0000)]
Merge "App Time Limits API in UsageStats" into pi-dev
Aseem Kumar [Fri, 16 Mar 2018 22:27:37 +0000 (22:27 +0000)]
Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev
Makoto Onuki [Fri, 16 Mar 2018 21:48:20 +0000 (21:48 +0000)]
Merge "Also show "last BS off time" in dumpsys power" into pi-dev
Robert Berry [Thu, 15 Mar 2018 15:28:05 +0000 (15:28 +0000)]
Create snapshot even if no PendingIntent is registered
When the user first unlocks the phone after booting, the system
app has not yet started. As such, it will not have had a chance to
register a PendingIntent. But if it has ever previously initialized,
the framework can still create a snapshot, and should. Otherwise, it
may be up to 72 hours before the user unlocks their phone again using
the primary method, which adds delay to the key sync.
Bug:
73921897
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: Idfaf53194e6a2f5d5ce0123d72f46197392d2c99
Julia Reynolds [Fri, 16 Mar 2018 13:09:45 +0000 (09:09 -0400)]
metrics constant for volume gesture.
Test: make
Bug:
75252670
Change-Id: Ifa4412d8e440d2259c534f5ad7a9914ef4239a6c
Aseem Kumar [Mon, 12 Mar 2018 21:34:58 +0000 (14:34 -0700)]
Unhide getKey() and importKey() and the whole class of RecoveryController.
Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all
public APIs of RecoveryController.
Bug:
73900159
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I1047c038603869307d7a2462a2e5635fcd1c94c2
Bryce Lee [Fri, 16 Mar 2018 19:11:56 +0000 (19:11 +0000)]
Merge "Do not sleep activities in focused stack when keyguard is going away" into pi-dev
Oscar Shu [Fri, 16 Mar 2018 18:45:27 +0000 (18:45 +0000)]
Merge "Deleting Visibility from WifiConfiguration" into pi-dev
Bill Yi [Fri, 16 Mar 2018 18:42:12 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I510439c0816ad0b800b0eae982024b580a686333
Bill Yi [Fri, 16 Mar 2018 18:21:56 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I657ea734aa601490b7e058c446cac74bd1d2406c
Yi Jin [Fri, 16 Mar 2018 18:18:11 +0000 (18:18 +0000)]
Merge "Fix privacy tags based on PWG review meeting." into pi-dev
Bryce Lee [Fri, 16 Mar 2018 18:04:00 +0000 (18:04 +0000)]
Merge "Clear calling UID before resolving intent types." into pi-dev
Jack Yu [Fri, 16 Mar 2018 17:39:54 +0000 (17:39 +0000)]
Merge "Renamed getNetworkId and getSystemId" into pi-dev
Dake Gu [Fri, 16 Mar 2018 17:32:25 +0000 (17:32 +0000)]
Merge "autofill: ViewRootImpl.dispatchKeyFromIme() should not be dropped" into pi-dev
Makoto Onuki [Fri, 16 Mar 2018 16:24:36 +0000 (09:24 -0700)]
Also show "last BS off time" in dumpsys power
Change-Id: I53d7727847b84b29bdc8285c50ce59def4378684
Fix:
75024658
Bug:
75024658
Test: Manual test with dumpsys power
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java
Philip P. Moltmann [Fri, 16 Mar 2018 16:04:08 +0000 (16:04 +0000)]
Merge "onUnsyncableAccount: Better docs, main thread" into pi-dev
TreeHugger Robot [Fri, 16 Mar 2018 15:43:46 +0000 (15:43 +0000)]
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
Jorim Jaggi [Fri, 16 Mar 2018 14:35:01 +0000 (14:35 +0000)]
Merge "Fix stuck exiting windows" into pi-dev
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
Yi Jin [Thu, 15 Mar 2018 20:49:44 +0000 (13:49 -0700)]
Fix privacy tags based on PWG review meeting.
1. Remove unnecessary hex_hashs.
2. Make intent extras LOCAL
3. Make mnc EXPLICIT
4. Make diskstats error AUTO since it is only IOException.
It is safe to modify proto numbers since they are not used yet.
Bug:
74837756
Test: flash the changes and call incident -d, also updated go/irpf
Change-Id: Idee0e927515e737c9a42a1dc29cb3c05e6d91ca9
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
Amith Yamasani [Sun, 11 Mar 2018 21:42:06 +0000 (14:42 -0700)]
App Time Limits API in UsageStats
Allow setting groups of apps to control usage time limits on.
Applies only to activity time in the foreground.
Updated UsageStatsTest app to be able to add an observer for
a 30 second timeout across multiple comma separated package
names.
Bug:
74335821
Test: atest FrameworksServicesTests:AppTimeLimitControllerTests
Install and run frameworks/base/tests/UsageStatsTest
Change-Id: I677c30b4f211f7acf72c9766df3d8c1ac56a4b4e
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
Philip P. Moltmann [Thu, 15 Mar 2018 23:32:44 +0000 (16:32 -0700)]
onUnsyncableAccount: Better docs, main thread
Describe that AbstractThreadedSyncAdapter.onUnsyncableAccount should return
immediately and call it on main thread.
Test: atest android.content.cts.AccountAccessSameCertTest
android.content.cts.DeferSyncTest
android.content.cts.ContentResolverSyncTestCase
com.android.cts.content.CtsSyncAccountAccessOtherCertTestCases
Fixes:
73750859
Change-Id: Ie9e1aefafe3a4a1b3f0fe8a65803554f07a94c42
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
Jack Yu [Thu, 15 Mar 2018 20:51:05 +0000 (13:51 -0700)]
Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()
Test: Build
Bug:
74976831
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
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 22:46:12 +0000 (23:46 +0100)]
Fix stuck exiting windows
When a window was marked as exiting because in WS.removeIfPossible
applyAnimationLocked returned true just because AWT was in
mClosing/OpeningApps for the transition, the window wasn't removed
if there was no animation running for the app transition.
Fix this by also calling the animation finished callback when not
running an animation, because other code parts rely on that being
called.
Test: Change language, swipe up, make sure no stuck window
Test: AppWindowTokenTests
Change-Id: I9cfd0c4090a258bc90ba5cf7d71795b6fce7f8ef
Fixes:
72811863
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
Bryce Lee [Thu, 15 Mar 2018 22:00:01 +0000 (15:00 -0700)]
Clear calling UID before resolving intent types.
By not clearing the uid, the intent type is not resolved and the
activity fails to launch. This change adds the resolve call to the
cleared UID scope, which previously encapsulated the invocation.
Fixes:
73297146
Test: Open images shortcut from secondary user's Downloads launcher
icon.
Change-Id: I656a4dcab962ff716bdd2b39441c07a10d5b8c8a
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
Bryce Lee [Thu, 15 Mar 2018 17:39:12 +0000 (10:39 -0700)]
Do not sleep activities in focused stack when keyguard is going away
ActivityStack#shouldSleepActivities reports back whether we should
put activities in stack to sleep based on the display state. We
should also consider the keyguard state, as it's possible for a stack
to become visible as the keyguard is disappearing, but before the
display has reported on, such as when we're unlocking by fingerprint.
In this case, sleeping will lead to an extraneous and incorrect
lifecycle shift to stop.
Change-Id: I0f0c8bc90093bf636e5ba9ddce7046da631248b0
Fixes:
74603384
Test: atest FrameworksServicesTests:com.android.server.am.ActivityStackTests#testShouldSleepActivities
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
Seigo Nonaka [Thu, 15 Mar 2018 07:22:20 +0000 (00:22 -0700)]
Make PrecomputedText Spannable for supporting selection
To support selectable TextView, make PrecomputedText spannable.
By this change, TextView start using DynamicLayout instead of
StaticLayout. DynamicLayout requires boundary rectangle of the
text, so this CL also adds getBounds method to PrecomputedText
which retrieves measured boundary box from native.
By this change, the selectable TextView performance for the
precomputed text 10x faster. On the other hand, the performacne
for the non-selectable text gets 2.5x slower. However, we concluded
that we accept this performance regression since it still 10 times
faster than non precomputed text.
Here is a precomputed text performance result of TextView.
android.widget.TextViewPrecomputedTextPerfTest:
newLayout_PrecomputedText : 736,130 -> 1,648,694: (+124.0%)
newLayout_PrecomputedText_Selectable : 17,379,765 -> 1,700,146: (-90.2%)
onDraw_PrecomputedText : 1,274,921 -> 1,848,076: (+45.0%)
onDraw_PrecomputedText_Selectable : 17,367,238 -> 1,399,169: (-91.9%)
onMeasure_PrecomputedText : 752,875 -> 1,766,606: (+134.6%)
onMeasure_PrecomputedText_Selectable : 17,647,842 -> 1,810,704: (-89.7%)
setText_PrecomputedText : 92,894 -> 135,471: (+45.8%)
setText_PrecomputedText_Selectable : 145,134 -> 215,757: (+48.7%)
Verified no effects for other performance metrics:
android.widget.TextViewPrecomputedTextPerfTest:
newLayout_RandomText : 16,495,200 -> 16,450,483: (-0.3%)
newLayout_RandomText_Selectable : 17,482,439 -> 17,534,207: (+0.3%)
onDraw_RandomText : 17,224,949 -> 17,228,072: (+0.0%)
onDraw_RandomText_Selectable : 18,067,397 -> 17,958,235: (-0.6%)
onMeasure_RandomText : 16,435,649 -> 16,516,352: (+0.5%)
onMeasure_RandomText_Selectable : 17,724,819 -> 17,879,508: (+0.9%)
setText_RandomText : 11,130 -> 11,259: (+1.2%)
setText_RandomText_Selectable : 48,900 -> 48,607: (-0.6%)
android.text.PrecomputedTextPerfTest:
create_NoStyled_Hyphenation : 17,695,377 -> 17,660,233: (-0.2%)
create_NoStyled_Hyphenation_WidthOnly : 17,677,423 -> 17,541,823: (-0.8%)
create_NoStyled_NoHyphenation : 7,021,486 -> 7,030,069: (+0.1%)
create_NoStyled_NoHyphenation_WidthOnly : 7,045,453 -> 7,067,021: (+0.3%)
create_Styled_Hyphenation : 12,090,933 -> 12,267,730: (+1.5%)
create_Styled_Hyphenation_WidthOnly : 12,105,491 -> 12,277,272: (+1.4%)
create_Styled_NoHyphenation : 11,835,249 -> 11,960,278: (+1.1%)
create_Styled_NoHyphenation_WidthOnly : 11,871,765 -> 11,912,444: (+0.3%)
android.text.StaticLayoutPerfTest:
create_PrecomputedText_NoStyled_Balanced_Hyphenation : 709,839 -> 697,134: (-1.8%)
create_PrecomputedText_NoStyled_Balanced_NoHyphenation: 527,671 -> 528,928: (+0.2%)
create_PrecomputedText_NoStyled_Greedy_Hyphenation : 477,259 -> 481,966: (+1.0%)
create_PrecomputedText_NoStyled_Greedy_NoHyphenation : 479,772 -> 482,278: (+0.5%)
create_PrecomputedText_Styled_Greedy_NoHyphenation : 639,322 -> 637,790: (-0.2%)
create_RandomText_NoStyled_Balanced_Hyphenation : 17,123,681 -> 16,989,227: (-0.8%)
create_RandomText_NoStyled_Balanced_NoHyphenation : 7,040,572 -> 7,064,175: (+0.3%)
create_RandomText_NoStyled_Greedy_Hyphenation : 7,000,681 -> 7,002,322: (+0.0%)
create_RandomText_NoStyled_Greedy_NoHyphenation : 6,997,115 -> 6,996,953: (-0.0%)
create_RandomText_Styled_Greedy_NoHyphenation : 11,948,744 -> 12,052,791: (+0.9%)
draw_PrecomputedText_NoStyled : 543,623 -> 513,741: (-5.5%)
draw_PrecomputedText_NoStyled_WithoutCache : 564,742 -> 541,795: (-4.1%)
draw_PrecomputedText_Styled : 838,581 -> 837,438: (-0.1%)
draw_PrecomputedText_Styled_WithoutCache : 826,775 -> 850,586: (+2.9%)
draw_RandomText_NoStyled : 538,162 -> 533,603: (-0.8%)
draw_RandomText_NoStyled_WithoutCache : 6,401,486 -> 6,424,604: (+0.4%)
draw_RandomText_Styled : 1,024,683 -> 1,011,575: (-1.3%)
draw_RandomText_Styled_WithoutCache : 2,733,204 -> 2,722,828: (-0.4%)
Bug:
72998298
Test: atest CtsWidgetTestCases:EditTextTest
CtsWidgetTestCases:TextViewFadingEdgeTest
FrameworksCoreTests:TextViewFallbackLineSpacingTest
FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
CtsTextTestCases FrameworksCoreTests:android.text
CtsWidgetTestCases:TextViewPrecomputedTextTest
Change-Id: I072dfd70b9a687d9c47e310d8cdb34f988fbb32e
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