OSDN Git Service
Bill Yi [Fri, 6 Jul 2018 04:05:33 +0000 (21:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab am:
b3bf111bd5 -s ours am:
4065ce8773 -s ours am:
03e1c5f227 -s ours am:
05968703a2 -s ours
am:
4a4b554061 -s ours
Change-Id: I91b22ce4464a7af4f3184a2ab47b89c318272b76
Bill Yi [Fri, 6 Jul 2018 03:34:56 +0000 (20:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab am:
b3bf111bd5 -s ours am:
4065ce8773 -s ours am:
03e1c5f227 -s ours
am:
05968703a2 -s ours
Change-Id: Iaaa67b162ee173f0b3ddb22c1b22d8997c3d6bc7
Bill Yi [Fri, 6 Jul 2018 03:07:47 +0000 (20:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab am:
b3bf111bd5 -s ours am:
4065ce8773 -s ours
am:
03e1c5f227 -s ours
Change-Id: Iddcf2126b4c25970d87e3f90a66033a9a09c5ace
Bill Yi [Fri, 6 Jul 2018 03:02:41 +0000 (20:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab am:
b3bf111bd5 -s ours
am:
4065ce8773 -s ours
Change-Id: I2f05f7f47f5e7aed365bee09afc30b019cb73993
Bill Yi [Fri, 6 Jul 2018 02:57:42 +0000 (19:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab
am:
b3bf111bd5 -s ours
Change-Id: Ice5c1a283c59a8640868cdc3a8acc4afb97e5468
TreeHugger Robot [Fri, 6 Jul 2018 02:17:24 +0000 (02:17 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 6 Jul 2018 02:06:10 +0000 (02:06 +0000)]
Merge "Fix GraphicBuffer creation not to use 0 usage flag"
Android Build Merger (Role) [Thu, 5 Jul 2018 20:32:02 +0000 (20:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228 skipped:
b586d4e9ab
Change-Id: Idb16f83382ec0d792c15733b46fe31a99e89552a
Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f8ecf21228
Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73
Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: If9dfa14b67b352f0e43cec9c151e75bcaa361e4d
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 5 Jul 2018 18:28:56 +0000 (18:28 +0000)]
Merge "Move displayId into InputEvent"
Siarhei Vishniakou [Fri, 8 Jun 2018 21:49:30 +0000 (22:49 +0100)]
Move displayId into InputEvent
Now both KeyEvent and MotionEvent will contain displayId. This will help
with dispatching input events to specific displays. There are use cases
where a particular input device is used for a specific display only, and
it sends key events to the system. This will help with those usages.
Test: atest view.MotionEventTest view.KeyEventTest
Bug:
64258305
Change-Id: I75891037617ed60820d60736216a0d615ab5e3b0
Neil Fuller [Thu, 5 Jul 2018 12:55:40 +0000 (05:55 -0700)]
Merge "Remove unusual static method call" am:
cbe9c295a3 am:
36beeefc84
am:
ee2bfdd54b
Change-Id: I6133c2bbd1b85515a316b10d93d998f9997118f3
Neil Fuller [Thu, 5 Jul 2018 12:46:04 +0000 (05:46 -0700)]
Merge "Remove unusual static method call" am:
cbe9c295a3
am:
36beeefc84
Change-Id: I6ecfb33be300b88a9308102595f0e79cf2f18ae4
Erik Kline [Thu, 5 Jul 2018 12:44:45 +0000 (05:44 -0700)]
Merge "Always close file descriptors" am:
26025a06ec am:
de8eac9ae1
am:
ed6cc299f4
Change-Id: I212cbbe134bba4580a6e73de9bb77e712d25c9a6
Neil Fuller [Thu, 5 Jul 2018 12:34:45 +0000 (05:34 -0700)]
Merge "Track constructor changes in libcore/" am:
f94eb29500 am:
67dcf6da3c
am:
9ca5d6f0a0
Change-Id: I7e7115799180d17e4ad6468e155aed79fc8600cb
Erik Kline [Thu, 5 Jul 2018 12:32:16 +0000 (05:32 -0700)]
Merge "Always close file descriptors" am:
26025a06ec
am:
de8eac9ae1
Change-Id: Id25f948b6b4d25ac033d9b608ab4a6b474f2c606
Neil Fuller [Thu, 5 Jul 2018 12:25:35 +0000 (05:25 -0700)]
Merge "Track constructor changes in libcore/" am:
f94eb29500
am:
67dcf6da3c
Change-Id: I1205219e1fead95ecdb8f9ce5d503ec416baf4c2
Neil Fuller [Thu, 5 Jul 2018 12:24:39 +0000 (05:24 -0700)]
Merge "Remove unusual static method call"
am:
cbe9c295a3
Change-Id: I3ae602232226ef3a1e482dd5a34e1025118c30b7
Erik Kline [Thu, 5 Jul 2018 12:20:25 +0000 (05:20 -0700)]
Merge "Always close file descriptors"
am:
26025a06ec
Change-Id: Ib1d8f74832b8b649dc83de39f8f16651a9924e69
Neil Fuller [Thu, 5 Jul 2018 12:14:26 +0000 (05:14 -0700)]
Merge "Track constructor changes in libcore/"
am:
f94eb29500
Change-Id: I344d9210bd173f78651318366c852f65afe969d6
Treehugger Robot [Thu, 5 Jul 2018 11:12:35 +0000 (11:12 +0000)]
Merge "Remove unusual static method call"
Neil Fuller [Thu, 5 Jul 2018 10:27:40 +0000 (10:27 +0000)]
Merge "Track changes in libcore to remove a constructor"
Neil Fuller [Wed, 4 Jul 2018 15:41:14 +0000 (16:41 +0100)]
Remove unusual static method call
The code is using static method Calendar.getInstance() but via a
subclass of Calendar. It works, and getInstance() returns a
GregorianCalendar on Android, but it's odd and was probably unintended.
Noticed during static analysis of SystemUI bytecode.
Bug:
111055375
Test: build / boot
Change-Id: I1762cbeb2cc7882868f84ec11100815671cd29ec
Treehugger Robot [Thu, 5 Jul 2018 09:07:21 +0000 (09:07 +0000)]
Merge "Always close file descriptors"
Neil Fuller [Thu, 5 Jul 2018 08:57:13 +0000 (08:57 +0000)]
Merge "Track constructor changes in libcore/"
Tadashi G. Takaoka [Thu, 5 Jul 2018 07:47:47 +0000 (16:47 +0900)]
Fix GraphicBuffer creation not to use 0 usage flag
(This is a cherry-pick of Ibd477a335e from pi-arc-dev)
Fixes:
110907362
Test: atest FrameworksServicesTests:com.android.server.wm.TaskSnapshotSurfaceTest
Change-Id: Ibd477a335e82f92bc39ec214c01bbeeead802ab0
Erik Kline [Wed, 4 Jul 2018 08:57:51 +0000 (17:57 +0900)]
Always close file descriptors
Every error thrown leaked a netlink NETFILTER socket.
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes
- enabled tethering and tried to cause conntrack updates to sessions
that had expired (which causes ErrnoExceptions to be thrown)
while monitoring lsof for system_server's NETFILTER sockets
Bug:
32163131
Bug:
64976634
Bug:
110122306
Change-Id: Ib52b812e8434c27ad9f2596666400c13e03c2216
Bill Yi [Thu, 5 Jul 2018 04:33:46 +0000 (21:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
3f4b3c946d -s ours
am:
2fd79e4f04 -s ours
Change-Id: I750f7031dce2023f2b586af1c18e75ed4895090b
Bill Yi [Thu, 5 Jul 2018 04:25:49 +0000 (21:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
3f4b3c946d -s ours
Change-Id: Ifa2e1f1e6a4ad161737403167925f8f7721a6542
TreeHugger Robot [Thu, 5 Jul 2018 03:46:24 +0000 (03:46 +0000)]
Merge changes from topic "q_dark_theme"
* changes:
Migrate SysUI theme to UiMode
Revert "Add theme mode design let user can choose theme self"
Revert "Activate dark theme when the UiMode is UI_MODE_NIGHT_YES."
Lucas Dupin [Wed, 6 Jun 2018 02:07:16 +0000 (19:07 -0700)]
Migrate SysUI theme to UiMode
Legacy RRO was deleted and resources migrated to DeviceDefault theme.
Theming via overlays is still possible, but the overlay should provide
both themes: day and night.
Test: adb shell service call uimode 4 i32 1
Test: adb shell service call uimode 4 i32 2
Change-Id: I5dee2f94764c5c2f4e11cfabfff97656b3822e8a
Shuichi.Noguchi [Thu, 5 Jul 2018 00:25:09 +0000 (17:25 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name" am:
d004710e0e am:
08923b73f4
am:
06cec22f3e
Change-Id: I9a46b6a07dcc063d539e3cf28f182f0bf7cfd64e
Shuichi.Noguchi [Thu, 5 Jul 2018 00:17:04 +0000 (17:17 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name" am:
d004710e0e
am:
08923b73f4
Change-Id: I5b4b6a208cb6fde4ba806f5aec3782244b772b94
Shuichi.Noguchi [Thu, 5 Jul 2018 00:07:32 +0000 (17:07 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name"
am:
d004710e0e
Change-Id: Ieecde6f75fd7788835fa34300f1fbec5eb963862
Bill Yi [Wed, 4 Jul 2018 23:58:23 +0000 (16:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I28cf7af28a854687af1b92930a9e79e02d685c35
Bill Yi [Wed, 4 Jul 2018 23:38:13 +0000 (16:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I48170a5ba97fbc61a7c843032d1d8c121d843e06
Auto-generated-cl: translation import
Treehugger Robot [Wed, 4 Jul 2018 22:45:16 +0000 (22:45 +0000)]
Merge "Fix the logic to get tv_pip_settings_class_name"
Lucas Dupin [Mon, 25 Jun 2018 01:22:10 +0000 (18:22 -0700)]
Revert "Add theme mode design let user can choose theme self"
The CL was intended only for P as a temporary solution.
This reverts commit
f0800fa3bd6d5279df3a183cc35ca5489112d73e.
Test: switch wallpapers, observe theme
Bug:
110758454
Change-Id: If10e4d87b6ddac10063b2671abd99e0baccdf92e
Lucas Dupin [Thu, 28 Jun 2018 20:23:48 +0000 (13:23 -0700)]
Revert "Activate dark theme when the UiMode is UI_MODE_NIGHT_YES."
This reverts commit
a5c846c3fa74d680eddca6b994b7cf8449d301ef.
Test: switch wallpapers, observe theme
Bug:
110758454
Reason: Obsolete in Q. UiMode is the only flag that drives
the dark ui.
Change-Id: Ie0307336b8c3896e3ecf934e073f51382c26364e
TreeHugger Robot [Wed, 4 Jul 2018 18:13:53 +0000 (18:13 +0000)]
Merge "Delay brightness change"
Neil Fuller [Tue, 3 Jul 2018 17:46:10 +0000 (18:46 +0100)]
Track changes in libcore to remove a constructor
Track changes in libcore to remove a constructor + lint
import order changes. Instead of the constructor a utility
method is introduced.
Test: Build / boot
Bug:
111055375
Change-Id: Id683a9d9d6e27d4c8df623dae189da9e74a6d410
Tiger Huang [Wed, 4 Jul 2018 03:06:31 +0000 (03:06 +0000)]
Merge "Don't flash system bars while showing an immersive app on lockscreen"
TreeHugger Robot [Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)]
Merge "Allow UiAutomation to adopt the shell permission indentity"
Lucas Dupin [Wed, 4 Jul 2018 02:49:30 +0000 (19:49 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Delay brightness change" into pi-dev am:
0937d1807b
am:
5d8e53ce88 -s ours
Change-Id: Ia11b6124a38c2f8cebd97a36f5f3c0e0f72da404
Lucas Dupin [Wed, 4 Jul 2018 02:45:44 +0000 (19:45 -0700)]
Merge "DO NOT MERGE: Delay brightness change" into pi-dev
am:
0937d1807b
Change-Id: Ib280983ca722add1f89f7a640a4f19c761239de9
TreeHugger Robot [Wed, 4 Jul 2018 02:34:42 +0000 (02:34 +0000)]
Merge "DO NOT MERGE: Delay brightness change" into pi-dev
TreeHugger Robot [Wed, 4 Jul 2018 02:32:37 +0000 (02:32 +0000)]
Merge "Update mMinLearnedBatteryCapacity when necessary."
TreeHugger Robot [Wed, 4 Jul 2018 01:54:37 +0000 (01:54 +0000)]
Merge "Reset field translation"
Lucas Dupin [Mon, 2 Jul 2018 18:17:14 +0000 (11:17 -0700)]
DO NOT MERGE: Delay brightness change
During a fingerprint wake-up, the display state changes bumping up
the display brightness. This means that the screen will flash
bright if the scrims couldn't draw and blank the screen yet.
The fix updates the state of the keyguard, waits for the frame to be
pushed to the display (can take up to 2 frames since we're using
triple buffers), when then asks PowerManager to wake-up the device.
Fixes:
80415238
Test: fp unlock with AOD on and off on devices with displays from
multiple vendors
Change-Id: I60f0e265c4af87cc1cb4fcf31e89558a330a4b71
Merged-In: I752f9bd5ffd754166ffee7dc15960909dd3f1a81
Lucas Dupin [Mon, 2 Jul 2018 18:17:14 +0000 (11:17 -0700)]
Delay brightness change
During a fingerprint wake-up, the display state changes bumping up
the display brightness. This means that the screen will flash
bright if the scrims couldn't draw and blank the screen yet.
The fix updates the state of the keyguard, waits for the frame to be
pushed to the display (can take up to 2 frames since we're using
triple buffers), when then asks PowerManager to wake-up the device.
Fixes:
80415238
Test: fp unlock with AOD on and off on devices with displays from
multiple vendors
Change-Id: I752f9bd5ffd754166ffee7dc15960909dd3f1a81
Tyler Gunn [Wed, 4 Jul 2018 00:09:58 +0000 (17:09 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
bc103bdf18 am:
4a319c85bd
am:
98138a2837
Change-Id: I2662ae0934dfa2ed9990ba69093c4455d1966332
Android Build Merger (Role) [Tue, 3 Jul 2018 23:58:21 +0000 (23:58 +0000)]
Merge "[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev am:
9654ecebd7 -s ours am:
d1b4a496ec -s ours"
Tor Norbye [Tue, 3 Jul 2018 23:57:23 +0000 (16:57 -0700)]
[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev am:
9654ecebd7 -s ours
am:
d1b4a496ec -s ours
Change-Id: Ie22a5c94c18f3e1a6a75a8440d2c26d50f71caea
Oscar Shu [Tue, 3 Jul 2018 23:54:54 +0000 (23:54 +0000)]
Merge "Update rssi thresholds in the base config.xml"
Svet Ganov [Mon, 25 Jun 2018 23:39:23 +0000 (16:39 -0700)]
Allow UiAutomation to adopt the shell permission indentity
For testing we often need to run shell commands. This can be done
today via running a shell command from an instrumentation test
started from the shell. However, this requires adding shell commands
which are not in the API contract, involve boilerplate code, require
string parsing, etc.
This change allows an instrumentation started from the shell to
adopt the shell UID permission state. As a result one can call APIs
protected by permissions normal apps cannot get by are granted to
the shell. This enables adding dedicated test APIs protected by
signatures permissions granted to the shell.
Test: cts-tradefed run cts-dev -m CtsUiAutomationTestCases
-t android.app.uiautomation.cts.UiAutomationTest#testAdoptShellPermissions
bug:
80415658
Change-Id: I4bfd4b475225125512abf80ea98cd8fcacb6a1be
Tyler Gunn [Tue, 3 Jul 2018 23:36:52 +0000 (16:36 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
bc103bdf18
am:
4a319c85bd
Change-Id: I6516ead9bfb3aa6b7c2d460fdab8de076cd07876
Tyler Gunn [Tue, 3 Jul 2018 23:27:56 +0000 (16:27 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
bc103bdf18
Change-Id: I2dbc17af8694cdb92e189202e0786fc39573b0d1
Tor Norbye [Tue, 3 Jul 2018 23:25:22 +0000 (16:25 -0700)]
[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev
am:
9654ecebd7 -s ours
Change-Id: I7513067846f13da2189a46f270a3a4ca0dbe0504
zhouwenjie [Tue, 3 Jul 2018 23:17:02 +0000 (16:17 -0700)]
Update mMinLearnedBatteryCapacity when necessary.
Currently mMinLearnedBatteryCapacity is only updated once (when it's
-1). We check the minimum of mMinLearnedBatteryCapacity and the new
chargeFullUah reading but never update mMinLearnedBatteryCapacity to the
new value.
Bug:
111132682
Test: manual
Change-Id: I1680e7a4bdf9176feb2a2dcc9f2c10c829202bda
Tor Norbye [Tue, 3 Jul 2018 23:11:25 +0000 (23:11 +0000)]
Merge "Include annotations in metalava stubs" into pi-dev
Lucas Dupin [Mon, 2 Jul 2018 22:22:58 +0000 (15:22 -0700)]
Reset field translation
Field could end up outside of the screen because translation would
be increased if animateText() were called multiple times in short
intervals.
Test: plug and unplug battery
Change-Id: I93510ffc9df5ed90709fc826499ad3a361f47eab
Fixes:
111006685
Lucas Dupin [Tue, 3 Jul 2018 22:46:12 +0000 (22:46 +0000)]
Merge "Clearer charging text"
TreeHugger Robot [Tue, 3 Jul 2018 22:41:47 +0000 (22:41 +0000)]
Merge "Tracks exception count by class name."
Tyler Gunn [Tue, 3 Jul 2018 22:15:21 +0000 (22:15 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
TreeHugger Robot [Tue, 3 Jul 2018 22:12:38 +0000 (22:12 +0000)]
Merge "Fix wrong duration format in logging"
Winson Chung [Tue, 3 Jul 2018 21:50:34 +0000 (21:50 +0000)]
Merge "Skip animation start logic if canceled"
Sumit Das [Sat, 30 Jun 2018 00:12:01 +0000 (17:12 -0700)]
ImsMultiEndPoint - Sip Notify Change
-Added log message, getter method and set/read from parcel
Change-Id: I832bd2cf51382bb0919ab0ea1b5c7fcba8b2b136
Olivier Gaillard [Thu, 7 Jun 2018 10:45:35 +0000 (11:45 +0100)]
Tracks exception count by class name.
The goal is to figure out if it would be worth monitoring these
exceptions. If exception types are only caller issues like
SecurityException and IllegalArgumentException, it is probably not worth
it. If we can find NPE or internal exceptions it would be worth
uploading the exceptions through dropbox.
Test: unit test
Change-Id: I779d43a0e6ca1a33535b90809491675420a51726
TreeHugger Robot [Tue, 3 Jul 2018 21:15:15 +0000 (21:15 +0000)]
Merge "Initial UsageStatsDatabase Perf tests"
Suprabh Shukla [Tue, 3 Jul 2018 21:00:29 +0000 (14:00 -0700)]
Fix wrong duration format in logging
Test: Just a logging change. Builds, boots.
Bug:
78560047
Change-Id: I159a54ef71ef08a699c3da244d51c10009df4d6f
Lei Yu [Tue, 3 Jul 2018 20:54:02 +0000 (13:54 -0700)]
[automerger skipped] Merge "Add active admin app to power white list." into pi-dev am:
a14e1b3950
am:
1e6fc486e3 -s ours
Change-Id: Ic3a6fb846ae7fb496a6dc246d72749f29d6cf5de
Wale Ogunwale [Tue, 3 Jul 2018 20:50:18 +0000 (20:50 +0000)]
Merge "Break direct calls to UserController object in AMS from activity classes (12/n)"
Lei Yu [Tue, 3 Jul 2018 20:41:34 +0000 (13:41 -0700)]
Merge "Add active admin app to power white list." into pi-dev
am:
a14e1b3950
Change-Id: I06229f8ee9fb72d579773c566f93ba447d18f4e5
TreeHugger Robot [Tue, 3 Jul 2018 20:34:32 +0000 (20:34 +0000)]
Merge "Stop restoring spell checker settings"
Neil Fuller [Tue, 3 Jul 2018 20:27:01 +0000 (13:27 -0700)]
Merge "Make Half class use public APIs" am:
7e957e57b7 am:
04c66489bc
am:
8b14d33acb
Change-Id: I6eb87843c251f726de2feb6827c54c8f7b75f1fe
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Add active admin app to power white list." into pi-dev
Neil Fuller [Tue, 3 Jul 2018 20:17:31 +0000 (13:17 -0700)]
Merge "Make Half class use public APIs" am:
7e957e57b7
am:
04c66489bc
Change-Id: I35fa0a22465885a47612601d541afb366b5953ec
Wale Ogunwale [Tue, 3 Jul 2018 20:13:13 +0000 (20:13 +0000)]
Merge "Reduce object allocation in AMS.computeOomAdjLocked()"
Neil Fuller [Tue, 3 Jul 2018 20:08:26 +0000 (13:08 -0700)]
Merge "Make Half class use public APIs"
am:
7e957e57b7
Change-Id: I7f41f07ed5d35a0c538c90b49b4500ba9952f74d
TreeHugger Robot [Tue, 3 Jul 2018 20:04:16 +0000 (20:04 +0000)]
Merge "Fix path rendering issues"
TreeHugger Robot [Tue, 3 Jul 2018 19:55:21 +0000 (19:55 +0000)]
Merge "Fix how we get provider pkgs"
Stan Iliev [Tue, 3 Jul 2018 18:47:59 +0000 (14:47 -0400)]
Fix path rendering issues
Fix remaining battery icon. Disable CCPR, which seems to
have caused a regression.
Test: Ran SystemUI and battery icon is drawn white.
Bug: skbug.com/8127
Change-Id: Ic82bce14b760a8889ea2261c44b2631dc755288f
Lucas Dupin [Tue, 3 Jul 2018 19:37:53 +0000 (12:37 -0700)]
Merge "Cross fade wake-up from pulsing" into pi-dev am:
42e713d7a3
am:
6af28886e3
Change-Id: I5d0f8cff0718fa2537ba7c4199347b3f0275952f
Jean-Michel Trivi [Tue, 3 Jul 2018 19:27:01 +0000 (12:27 -0700)]
Merge "AudioService: history of A2DP commands" into pi-dev am:
cd64600ba8
am:
0ff52617be
Change-Id: I69915fa0e27d9d16c22eaf53d17aa9f9f0a1eb14
TreeHugger Robot [Tue, 3 Jul 2018 19:21:57 +0000 (19:21 +0000)]
Merge "Be more strict about triggering notification lights"
Lucas Dupin [Tue, 3 Jul 2018 19:20:31 +0000 (12:20 -0700)]
Merge "Cross fade wake-up from pulsing" into pi-dev
am:
42e713d7a3
Change-Id: Ieb0607ff1abf36ca56565b49aeb2f565a115bc55
Minchan Kim [Tue, 3 Jul 2018 19:17:00 +0000 (12:17 -0700)]
Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev am:
fb11e4c9b1
am:
6614a08683
Change-Id: Ie46e76f215dcb22b3d1eb4c0e9d19e8e49d4b715
Jean-Michel Trivi [Tue, 3 Jul 2018 19:11:10 +0000 (12:11 -0700)]
Merge "AudioService: history of A2DP commands" into pi-dev
am:
cd64600ba8
Change-Id: Ibc294825a942fd0f4b5fbe6c09eafac43ed2cccc
Eran Messeri [Tue, 3 Jul 2018 19:07:59 +0000 (12:07 -0700)]
Merge "Correctly preserve key generation parameters" into pi-dev am:
6f7cfb0627
am:
e323fcbe98
Change-Id: I8cdbb82cd6fee604775764519dc8bf835a9c3738
Minchan Kim [Tue, 3 Jul 2018 19:05:38 +0000 (12:05 -0700)]
Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev
am:
fb11e4c9b1
Change-Id: Icc9d0bb40515a87ddb0c8c0b28d0715a3f6bb0fe
Eran Messeri [Tue, 3 Jul 2018 18:59:13 +0000 (11:59 -0700)]
Merge "Correctly preserve key generation parameters" into pi-dev
am:
6f7cfb0627
Change-Id: Id7fb68a441e873f7ae844bfc87f7f60798ecd57c
Lucas Dupin [Tue, 3 Jul 2018 18:52:23 +0000 (18:52 +0000)]
Merge "Cross fade wake-up from pulsing" into pi-dev
Jean-Michel Trivi [Tue, 3 Jul 2018 18:49:33 +0000 (18:49 +0000)]
Merge "AudioService: history of A2DP commands" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev
Lucas Dupin [Tue, 3 Jul 2018 18:37:52 +0000 (11:37 -0700)]
Clearer charging text
Used to be "Charged," now it is "Fully Charged."
Test: visual
Change-Id: I5cda3110d8fbfa58985625e3a0ccf5ef354f7d09
Fixes:
111100554
Neil Fuller [Tue, 3 Jul 2018 18:32:27 +0000 (18:32 +0000)]
Merge "Make Half class use public APIs"
TreeHugger Robot [Tue, 3 Jul 2018 18:31:06 +0000 (18:31 +0000)]
Merge "Correctly preserve key generation parameters" into pi-dev
Fyodor Kupolov [Tue, 3 Jul 2018 18:27:47 +0000 (18:27 +0000)]
Merge "Use sharedUserId as package name if there are collisions"
Neil Fuller [Tue, 3 Jul 2018 18:22:45 +0000 (19:22 +0100)]
Track constructor changes in libcore/
The 2-arg constructor is being removed.
Test: build / boot
Bug:
111055375
Change-Id: I72413a8c7885f9514a88f59deb649fa755deff92