OSDN Git Service
TreeHugger Robot [Tue, 10 Jul 2018 21:51:44 +0000 (21:51 +0000)]
Merge "Use app ops string string when checking ops."
TreeHugger Robot [Tue, 10 Jul 2018 21:23:12 +0000 (21:23 +0000)]
Merge "Add nullability annotations to state save/restoration"
TreeHugger Robot [Tue, 10 Jul 2018 20:55:05 +0000 (20:55 +0000)]
Merge "Do not commit session twice"
Nathan Harold [Tue, 10 Jul 2018 20:13:09 +0000 (13:13 -0700)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
am:
2ac4249f8c
Change-Id: I95fb510bcb881f52dc20ff567f3e51f93b0b7290
Nathan Harold [Tue, 10 Jul 2018 19:57:15 +0000 (19:57 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
Christopher Morin [Tue, 10 Jul 2018 19:23:19 +0000 (19:23 +0000)]
Merge "Revert "OOM score management""
TreeHugger Robot [Tue, 10 Jul 2018 19:08:20 +0000 (19:08 +0000)]
Merge "Use light theme for printSpooler"
Mathew Inwood [Tue, 10 Jul 2018 19:02:21 +0000 (12:02 -0700)]
Merge "Add build rule for API->source mapping." am:
b4919259ab am:
4500790a81
am:
c47c718a3b
Change-Id: I7d35a2de0b5fe8c4fe9e4994de910b64c63da2b8
Mathew Inwood [Tue, 10 Jul 2018 18:51:02 +0000 (11:51 -0700)]
Merge "Add build rule for API->source mapping." am:
b4919259ab
am:
4500790a81
Change-Id: Idc214d73fcf555ac15f865cc9be60909399170f8
Mathew Inwood [Tue, 10 Jul 2018 18:41:48 +0000 (11:41 -0700)]
Merge "Add build rule for API->source mapping."
am:
b4919259ab
Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a
Aaron Heuckroth [Tue, 10 Jul 2018 18:05:34 +0000 (18:05 +0000)]
Merge "Move channel logging to dump method and redact name."
Winson Chung [Tue, 10 Jul 2018 18:04:39 +0000 (18:04 +0000)]
Merge "Ensure the ActionProxyReceiver runs as the system user"
Michael Wachenschwanz [Tue, 10 Jul 2018 18:01:34 +0000 (11:01 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking" am:
62d5e041a2 -s ours am:
ccee79d9ce -s ours
am:
0da8f4070f -s ours
Change-Id: I2a88beff7e14d05a1a7041c415a5863337e916ca
Michael Wachenschwanz [Tue, 10 Jul 2018 17:48:55 +0000 (10:48 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking" am:
62d5e041a2 -s ours
am:
ccee79d9ce -s ours
Change-Id: Ic27debc1b021a77de57e384df7dba0f1d9209df8
Michael Wachenschwanz [Tue, 10 Jul 2018 17:36:25 +0000 (10:36 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am:
62d5e041a2 -s ours
Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f
Christopher Morin [Mon, 9 Jul 2018 21:43:45 +0000 (21:43 +0000)]
Revert "OOM score management"
This reverts commit
af5451f0aca12467e2eeb4c8e14d2b6b4c7083fc.
Reason for revert: Causes b/
110976005
Exempt-From-Owner-Approval: Needed to avoid a widespread breakage
Change-Id: Ibe969726601d6e4ce9a66b1bf8998cb33a955619
Mathew Inwood [Tue, 10 Jul 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Add build rule for API->source mapping."
TreeHugger Robot [Tue, 10 Jul 2018 17:11:24 +0000 (17:11 +0000)]
Merge "Fix NPE in makeTransformCanvas"
Colin Cross [Tue, 10 Jul 2018 16:45:03 +0000 (09:45 -0700)]
Merge "Mark installable jars with installable: true" am:
1035f48f61 am:
19609a7993
am:
c7f9e053ec
Change-Id: I5934f14ced4a89fa234d75fde733aae1f102cc7a
Jake Wharton [Tue, 10 Jul 2018 16:27:59 +0000 (12:27 -0400)]
Add nullability annotations to state save/restoration
Bug:
110513685
Test: none
Change-Id: I570f0c5430ca29972d542e523a6d83ab567b4ed1
Colin Cross [Tue, 10 Jul 2018 16:29:55 +0000 (09:29 -0700)]
Merge "Mark installable jars with installable: true" am:
1035f48f61
am:
19609a7993
Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c
Treehugger Robot [Tue, 10 Jul 2018 16:24:47 +0000 (16:24 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"
John Reck [Tue, 10 Jul 2018 16:14:57 +0000 (09:14 -0700)]
Fix NPE in makeTransformCanvas
Test: builds && hwuiunit passes
Change-Id: Ie728832352b3652630c11bdb3115872482f12923
Colin Cross [Tue, 10 Jul 2018 16:12:46 +0000 (09:12 -0700)]
Merge "Mark installable jars with installable: true"
am:
1035f48f61
Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922
TreeHugger Robot [Tue, 10 Jul 2018 16:02:22 +0000 (16:02 +0000)]
Merge "Compile android.test.*.stubs into dex"
TreeHugger Robot [Tue, 10 Jul 2018 15:57:21 +0000 (15:57 +0000)]
Merge "Remove AndroidRuntime::getJNIEnv() usage from libmedia2_jni"
Colin Cross [Tue, 10 Jul 2018 14:51:50 +0000 (14:51 +0000)]
Merge "Mark installable jars with installable: true"
Olivier Gaillard [Tue, 10 Jul 2018 14:08:18 +0000 (14:08 +0000)]
Merge "Resolve codes to method names for binder call stats."
David Brazdil [Thu, 28 Jun 2018 09:23:50 +0000 (10:23 +0100)]
Compile android.test.*.stubs into dex
Adjust the build rules of android.test.*.stubs packages to also
produce a jar with dex files. This will be used by the `hiddenapi`
tool to categorize the boot class path equivalents as public API.
Bug:
79409988
Test: m android.test.base.stubs ; check javalib.jar contains dex
Change-Id: I1d0850b18044c559ea4b9893d929dc45884b32c3
Julia Reynolds [Tue, 10 Jul 2018 13:11:04 +0000 (06:11 -0700)]
Merge "Be more strict about triggering notification lights" into pi-dev am:
f00bfbe46e
am:
89e2a45c20
Change-Id: Ieea3c2a7b4c2d7b34bcece6ac14a566f66de29a9
Julia Reynolds [Tue, 10 Jul 2018 13:03:42 +0000 (06:03 -0700)]
Merge "Be more strict about triggering notification lights" into pi-dev
am:
f00bfbe46e
Change-Id: I6c999a970a309f7888d6157c7a17f5d0ca05e32c
Julia Reynolds [Tue, 10 Jul 2018 12:49:16 +0000 (12:49 +0000)]
Merge "Be more strict about triggering notification lights" into pi-dev
Olivier Gaillard [Thu, 7 Jun 2018 17:20:10 +0000 (18:20 +0100)]
Resolve codes to method names for binder call stats.
Test: unit test
Change-Id: Ie2178e6f9ebb900251d7c9ab20587d3c01acda83
Olivier Gaillard [Tue, 10 Jul 2018 09:08:40 +0000 (02:08 -0700)]
Merge "Add a getTransactionName method to Binder." am:
079f03f584 am:
06aa142232
am:
0600f8d76f
Change-Id: I9c86300654d3ecd9ea745b7997ed35f605452e9d
Olivier Gaillard [Tue, 10 Jul 2018 08:59:32 +0000 (01:59 -0700)]
Merge "Add a getTransactionName method to Binder." am:
079f03f584
am:
06aa142232
Change-Id: I4695382d0c3e6489428a3178326630c655c3f0d5
Olivier Gaillard [Tue, 10 Jul 2018 08:50:30 +0000 (01:50 -0700)]
Merge "Add a getTransactionName method to Binder."
am:
079f03f584
Change-Id: Ie157d490cf074d5b015406cb9739366cc4d46b87
Mathew Inwood [Fri, 22 Jun 2018 14:30:02 +0000 (15:30 +0100)]
Add build rule for API->source mapping.
This is used to get source positions of all class members in the boot
class path, to automate the addition of annotations. See
go/hidden-api-annotations for more context.
Mappings printed in:
out/soong/.intermediates/frameworks/base/hiddenapi-mappings
/android_common/dex-mapping.txt
Test: make hiddenapi-mappings
Bug:
110868826
Change-Id: Ie67a8be6a5a71447a25d081bd466b8b5e01b0725
Nandana Dutt [Tue, 10 Jul 2018 08:13:12 +0000 (08:13 +0000)]
Merge "Fix the lost RAM calculation"
Olivier Gaillard [Tue, 10 Jul 2018 07:23:14 +0000 (07:23 +0000)]
Merge "Add a getTransactionName method to Binder."
TreeHugger Robot [Tue, 10 Jul 2018 05:14:25 +0000 (05:14 +0000)]
Merge "Preparation task for Settings Fragment Migration"
TreeHugger Robot [Tue, 10 Jul 2018 02:45:25 +0000 (02:45 +0000)]
Merge "Add handlers for more cec commands into HdmiCecLocalDevice."
Erik Kline [Tue, 10 Jul 2018 02:00:04 +0000 (19:00 -0700)]
[automerger skipped] Merge "Always close file descriptors" into pi-dev am:
8fe381f0fd -s ours
am:
7110d0387d -s ours
Change-Id: I620df55b98e3f07ddd4329b533770fcdc9874a11
Jason Monk [Tue, 10 Jul 2018 01:54:41 +0000 (18:54 -0700)]
Merge "Fix leak where system held onto slice providers" into pi-dev am:
a2b1e5f013
am:
a66cf9ce0c
Change-Id: I23b3d9928098684e65d5791efdcbcac19225c8fa
Chavi Weingarten [Tue, 10 Jul 2018 01:46:54 +0000 (18:46 -0700)]
[automerger skipped] Merge "WM: Add debug information for forced seamless rotation" into pi-dev am:
4db8f31c43
am:
1318f4fa0a -s ours
Change-Id: Ia41192862eced30509bcd50ed387fc0fa9c9ce7d
TreeHugger Robot [Tue, 10 Jul 2018 01:31:17 +0000 (01:31 +0000)]
Merge "MediaSessionRecord: protect adjustVolume from SecurityException"
TreeHugger Robot [Tue, 10 Jul 2018 01:12:22 +0000 (01:12 +0000)]
Merge "Now track "active time" in procstats."
Erik Kline [Tue, 10 Jul 2018 01:10:41 +0000 (18:10 -0700)]
[automerger skipped] Merge "Always close file descriptors" into pi-dev
am:
8fe381f0fd -s ours
Change-Id: I831da822dea43107aafd6a5ad54a4a7832d0699a
Jason Monk [Tue, 10 Jul 2018 01:03:47 +0000 (18:03 -0700)]
Merge "Fix leak where system held onto slice providers" into pi-dev
am:
a2b1e5f013
Change-Id: I09ba87cf5c1f1a0099119a015fdd113a3da2375c
Hall Liu [Tue, 10 Jul 2018 01:01:01 +0000 (18:01 -0700)]
Merge "Fix readImmediately for CTS" into pi-dev am:
ec328eea49
am:
df1ac1700e
Change-Id: Ia80975223bf06bf6d8a04403a6ab11274ff22d6c
Chavi Weingarten [Tue, 10 Jul 2018 00:55:40 +0000 (17:55 -0700)]
Merge "WM: Add debug information for forced seamless rotation" into pi-dev
am:
4db8f31c43
Change-Id: I70af626a302fde9b3bd7bd4733799cac67e5dcbe
Hall Liu [Tue, 10 Jul 2018 00:44:16 +0000 (17:44 -0700)]
Merge "Fix readImmediately for CTS" into pi-dev
am:
ec328eea49
Change-Id: Ife6c64a03a3ac46430198db05ec6c9ac87524900
TreeHugger Robot [Tue, 10 Jul 2018 00:29:01 +0000 (00:29 +0000)]
Merge "Dump swipe up setting with OverviewProxyService"
TreeHugger Robot [Tue, 10 Jul 2018 00:28:57 +0000 (00:28 +0000)]
Merge "Always close file descriptors" into pi-dev
Hall Liu [Tue, 10 Jul 2018 00:08:14 +0000 (00:08 +0000)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
TreeHugger Robot [Tue, 10 Jul 2018 00:02:26 +0000 (00:02 +0000)]
Merge "Auto-dark mode prototype"
Jean-Michel Trivi [Mon, 9 Jul 2018 22:51:16 +0000 (15:51 -0700)]
MediaSessionRecord: protect adjustVolume from SecurityException
Take into account that all methods that end up calling
AudioService.adjustStreamVolume(...) can throw a
SecurityException when the caller doesn't have the right
permission to change the DnD mode.
Bug:
110525559
Test: none yet
Change-Id: I4622a07ea8be2ce03fb9732796a08f671a17b45d
TreeHugger Robot [Mon, 9 Jul 2018 23:49:42 +0000 (23:49 +0000)]
Merge "Fix leak where system held onto slice providers" into pi-dev
Chavi Weingarten [Mon, 9 Jul 2018 23:45:34 +0000 (23:45 +0000)]
Merge "WM: Add debug information for forced seamless rotation" into pi-dev
Wei Wang [Tue, 3 Jul 2018 23:33:24 +0000 (16:33 -0700)]
Use app ops string string when checking ops.
Permission string is used instead of app ops string. This would
cause RemoteExceptions when getting last location.
Bug:
111104930
Test: Manual, with test app
Change-Id: Ia284b1103f667bd29cf2bc0877dd8f605723b0ff
Haibo Huang [Mon, 9 Jul 2018 22:56:22 +0000 (15:56 -0700)]
Merge "Remove CSV support" am:
0faecf7b89 am:
9fada2364f
am:
6fc2f09b35
Change-Id: I28d0bae71507247125daadf39313a9dab5b284fd
Winson Chung [Mon, 9 Jul 2018 22:55:56 +0000 (15:55 -0700)]
Ensure the ActionProxyReceiver runs as the system user
- Secondary users have a SysUI process but no status bar, so we need to
actually call executeRunnableDismissingKeyguard() from the system user.
(The actual call to start the proxied activity will still be handled as
the current user though)
Bug:
72459081
Test: Switch to secondary user, take screenshot and then try to share/edit
Change-Id: Id7bcd6f9090412902d90566de074d1c2f235b8d6
TreeHugger Robot [Mon, 9 Jul 2018 22:47:29 +0000 (22:47 +0000)]
Merge "Fix readImmediately for CTS" into pi-dev
Haibo Huang [Mon, 9 Jul 2018 22:44:54 +0000 (15:44 -0700)]
Merge "Remove CSV support" am:
0faecf7b89
am:
9fada2364f
Change-Id: Ibf1fe01c8e69407decf760307ad3747f1c3cb317
TreeHugger Robot [Mon, 9 Jul 2018 22:28:55 +0000 (22:28 +0000)]
Merge "Add boolean to check never occurring zen schedule rule validity"
Haibo Huang [Mon, 9 Jul 2018 21:41:03 +0000 (14:41 -0700)]
Merge "Remove CSV support"
am:
0faecf7b89
Change-Id: I02e8b74299afda2642567e3fcf9a41653cb7b888
Winson Chung [Mon, 9 Jul 2018 21:30:54 +0000 (14:30 -0700)]
Dump swipe up setting with OverviewProxyService
- Rename some vars slightly to make it easer to understand when reading the
dump
Bug:
111272828
Test: adb shell dumpsys activity service com.android.systemui
Change-Id: I3a913478abebb62058a978b52f50a1a03e587994
Dake Gu [Mon, 9 Jul 2018 21:34:21 +0000 (21:34 +0000)]
Merge "TvInputManager: fix leaking Context when failed create Session"
Adrian Roos [Fri, 6 Jul 2018 09:39:54 +0000 (02:39 -0700)]
WM: Add debug information for forced seamless rotation
Bug:
111062294
Test: adb shell dumpsys window ScreenDecoration
Change-Id: I2521cfde6cdc04644666eff753226d6d008d378f
Merged-In: I2521cfde6cdc04644666eff753226d6d008d378f
Olivier Gaillard [Thu, 5 Jul 2018 14:07:35 +0000 (15:07 +0100)]
Add a getTransactionName method to Binder.
This method transforms a binder call code to a human readable name.
AIDL generator will have the ability to override this method.
Test: n/a
Bug:
111200705
Change-Id: Ic1d82e9b403ab40c8b625ca977a819ccd521dd97
Hall Liu [Sat, 9 Jun 2018 01:14:21 +0000 (18:14 -0700)]
Update SubscriptionInfo o use strings for mccmnc
Add methods to get mcc/mnc as strings so that the leading-zero
ambiguity is resolved.
Test: manual (db update), unit tests
Bug:
35064313
Change-Id: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Haibo Huang [Mon, 9 Jul 2018 20:32:31 +0000 (20:32 +0000)]
Merge "Remove CSV support"
Amy [Mon, 4 Jun 2018 19:00:09 +0000 (12:00 -0700)]
Add handlers for more cec commands into HdmiCecLocalDevice.
Test: make -j18.
Change-Id: I789b98f0c375d776a9ea4777200f22c36c322a85
(cherry picked from commit
c1c08f9c6a706ed7b09fd2596e5c3592e72ffdd6)
Nick James [Mon, 9 Jul 2018 20:21:37 +0000 (20:21 +0000)]
Merge "Disable DND status change notification on watches."
Dianne Hackborn [Mon, 9 Jul 2018 16:09:05 +0000 (09:09 -0700)]
Now track "active time" in procstats.
Associations now keep track of the time they are
actively involved in impacting their target application.
This is based on the procstate propagating through the
association being the same as the procstate of its target
process... so it may count as active when there is
another reason for that process to be in the same state.
To do this, we now maintain a set of "tracking
associations" -- these are in-use associations that
we know we need to be tracking to determine whether
they are active. This list is built based on whether
we at all consider an association during an oom_adj
computation, and at the end of that walked to determine
which of those associations are currently active.
Also add tracking of associations through external
provider references, with a tag name now needing to be
passed through so we can mark up the reason for the
external reference.
Test: manual
Bug:
110957691
Change-Id: I426a499834e20a9d7f2b439faf9cb398d9792fa2
Olivier Gaillard [Mon, 9 Jul 2018 19:09:47 +0000 (19:09 +0000)]
Merge "Add experiment flag to control binder call stats."
Philip P. Moltmann [Sat, 7 Jul 2018 00:03:05 +0000 (17:03 -0700)]
Use light theme for printSpooler
- replace png's by vector graphics
- Use alredy existing icons if possible
- Remove unnnecessary hard coded color values
- hard code all colors for preview-page as the background colors are
hard coded, hence foreground also needs to be hard coded.
- Unify layout of loading/error/select printer UI
Test: Looked at print spooler. Switched theme to dark and checked if all
looks ok too.
Change-Id: I07cc619d575c7372bd18550db8f2582df657cc5c
Martijn Coenen [Mon, 9 Jul 2018 18:12:06 +0000 (18:12 +0000)]
Merge "Move BinderProxy serialization into Java."
Martijn Coenen [Thu, 5 Jul 2018 12:58:59 +0000 (14:58 +0200)]
Move BinderProxy serialization into Java.
The BinderProxy class is not thread-safe, and all calls into
it were serialized by holding gProxyLock from JNI code. More
recently, we've been wanting to access BinderProxy from Java
code directly, and having the lock in native complicated things.
This change removes the lock in native code and adds it in the
Java layer. A benefit of this change is that it reduces the
scope of where a lock is held. On the flip side, we no longer
have a cached BinderProxyNativeData object lying around. This
means we now allocate/free a BinderProxyNativeData even if we
already have a Java object lying around for the native object,
which can happen quite frequently. But we deem the impact of
this to be acceptable.
Bug:
109888955
Test: sailfish builds, boots, proxy warnings still show
Change-Id: If2f4dbe5486ec7af0ef8ea42d24ac3a4330cc05a
tmfang [Wed, 4 Jul 2018 07:59:21 +0000 (15:59 +0800)]
Preparation task for Settings Fragment Migration
Create some compatible files.
These files can be used for Settings Fragment Migration task.
Bug:
110259478
Test: make RunSettingsLibRoboTests -j40
Change-Id: Ib3d52e9a5f5bed5c194d429fdfa4b0d01ed07f01
Jorim Jaggi [Mon, 9 Jul 2018 18:04:52 +0000 (11:04 -0700)]
Fix janky wakeup animation am:
c4cf07a16f
am:
ad08a8b21d
Change-Id: I3e9c1c9b5983534708ea2a092ed5b7523487f0bf
Jorim Jaggi [Mon, 9 Jul 2018 17:55:53 +0000 (10:55 -0700)]
Fix janky wakeup animation
am:
c4cf07a16f
Change-Id: I198ed0d6d5385ba54f548def2680a02a400ee0c2
TreeHugger Robot [Mon, 9 Jul 2018 17:38:36 +0000 (17:38 +0000)]
Merge "[QS] Use DateFormat with night tile time"
Julia Reynolds [Tue, 3 Jul 2018 14:43:35 +0000 (10:43 -0400)]
Be more strict about triggering notification lights
Don't trigger lights if they should be suppressed by notification flags.
Don't log that notification lights happened if global or temporary
settings have turned them off
Test: runtest systemui-notification, verify
notification_itnerruptiveness numbers for a fresh 3p app that uses
lights
Bug:
111069748
Change-Id: I68750bf39eb76ef0bda40ddacfd90e1be79e8575
(cherry picked from commit
28149f65f9f036f746957d1323efda20aed94ba3)
Aaron Heuckroth [Tue, 3 Jul 2018 19:14:04 +0000 (15:14 -0400)]
Move channel logging to dump method and redact name.
Test: Generate bug report and confirm that NotificationChannel logs contain redacted name strings.
Change-Id: Iebaf7b165de0276e69ead862aa7ec864ef912282
Fixes:
78326066
Nick [Tue, 3 Jul 2018 18:32:39 +0000 (11:32 -0700)]
Disable DND status change notification on watches.
Added a check to the showZenUpgradeNotification logic to detect the
presence of a watch.
Reupload of ag/
4436427 which was reverted (ag/
4466787) because I forgot to get
approvals from main Android team.
Bug:
74178001
Test: Flashed image to watch, saw expected behavior
Change-Id: If88df0fe2f3ecd0d6e075d56747ba32213bb2131
John Reck [Tue, 3 Jul 2018 01:33:32 +0000 (18:33 -0700)]
Auto-dark mode prototype
Experimental force_dark prototype mode. Enabled
by setting debug.hwui.force_dark to true.
Test: verified nothing changes without prop being set
Change-Id: Ib02f3f1a9c591cab1f312b827451f04c782c2f41
Jorim Jaggi [Thu, 5 Jul 2018 16:28:12 +0000 (18:28 +0200)]
Fix janky wakeup animation
Previous wake-up animation was totally broken before, as multiple
animations were running with different interpolators and different
durations, creating a really jaring experience for the front-door
of the phone, which users see hundreds of times a day.
Instead, we use a single animator to drive everything, and pass in
both the interpolated and the linear value so the right value can
be used in whichever place.
Test: Wakeup/sleep phone with different numbers of notifications
Fixes:
110980608
Change-Id: If1758404a4c49fcd7dc9fa3c93bb18e42a586632
Nandana Dutt [Thu, 5 Jul 2018 09:06:18 +0000 (10:06 +0100)]
Fix the lost RAM calculation
The formula used when reporting memory usage when device goes
low on memory should exclude SwapPss, which was incorrectly
being included as part of totalPss.
BUG:
109762356
Test: Manually tested on a gobo device by making it
go low on memory. Verified that the Lost RAM in adb logcat
was negative before, and is positive with the change,
and close to Lost RAM from "dumpsys meminfo".
Change-Id: Ic54181b55fa03d3faebda4c0516c95c18ee39e41
Adrian Roos [Fri, 6 Jul 2018 09:39:54 +0000 (02:39 -0700)]
WM: Add debug information proto definition from other branch
To make sure that the proto definitions stay in sync across branches,
we merge them to master even though the logic for this does not exist
here.
Bug:
111062294
Test: make droid
Change-Id: I2521cfde6cdc04644666eff753226d6d008d378f
Wesley Wang [Mon, 9 Jul 2018 06:05:12 +0000 (06:05 +0000)]
Merge "Fix Power menu background vanish"
Wesley.CW Wang [Wed, 4 Jul 2018 09:35:00 +0000 (17:35 +0800)]
Fix Power menu background vanish
- Separated button & origin button use same HardwareBgDrawable caused
power menu background vanish when keyboard showing.
- Let separated button use mSeparatedViewBackground & origin button use
mListBackground to fix this bug.
- Rename View mChild to mList.
Test: Manually, long press power key to launch power menu when keyboard
showing, power menu background should display normally.
Bug:
111101759
Change-Id: Ic08cabc63daebc4001c8eda751857d11cb0e6352
TreeHugger Robot [Sun, 8 Jul 2018 00:10:34 +0000 (00:10 +0000)]
Merge "Revert "Add UrlSpanFactory to Linkify""
Ian Pedowitz [Sat, 7 Jul 2018 22:02:29 +0000 (22:02 +0000)]
Revert "Add UrlSpanFactory to Linkify"
This reverts commit
ad4883bb1b2a3e5e0c3a6345ee0ab05e4c1e4a43.
Reason for revert: b/
111218263
Bug:
28536972
Bug:
32613009
Bug:
29150779
Change-Id: Idc1621d472d742929f56d10d72b077b774b9e56e
TreeHugger Robot [Sat, 7 Jul 2018 02:22:38 +0000 (02:22 +0000)]
Merge "Update OWNERS file"
Siyamed Sinir [Sat, 7 Jul 2018 00:57:35 +0000 (00:57 +0000)]
Merge "Add UrlSpanFactory to Linkify"
Andrew Solovay [Sat, 7 Jul 2018 00:55:34 +0000 (00:55 +0000)]
Merge "docs: Typo fixes"
Haibo Huang [Fri, 6 Jul 2018 23:55:27 +0000 (16:55 -0700)]
Remove CSV support
CSV is deprecated upstream. See:
https://github.com/google/benchmark/commit/
7b8d0249d8d66040ce9ffe6b94cc8421ef3e61d8
Test: m checkbuild
Change-Id: I4b85535d4296c6f0d1f0eec95b40c065b3143134
Nathan Harold [Wed, 28 Mar 2018 15:39:43 +0000 (08:39 -0700)]
Update Wcdma and Tdscdma CellInfo for HAL 1.2
In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.
Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.
-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
the getLevel() methods of CellSignalStrength<RAT>
Bug:
76153768
Test: RILTests added for TDSCDMA
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Lucas Dupin [Fri, 6 Jul 2018 22:34:20 +0000 (15:34 -0700)]
[automerger skipped] Merge "Hide windows even when AOD is off" into pi-dev am:
5c75b5b60e
am:
4b6d16696f -s ours
Change-Id: I61f9373e217095ad224415ad17cc1061d0fc8dbf
Lucas Dupin [Fri, 6 Jul 2018 22:23:30 +0000 (15:23 -0700)]
Merge "Hide windows even when AOD is off" into pi-dev
am:
5c75b5b60e
Change-Id: If72e024f9d3d31ef774588b5cac5f1b553608717