OSDN Git Service
Chenjie Yu [Wed, 18 Apr 2018 17:20:42 +0000 (10:20 -0700)]
Merge "Fix merge isolated uid to host uid" into pi-dev
am:
2abcea2b8a
Change-Id: Ib1f2929cea7ecc1345f78c3c2c1296cecfcc814b
TreeHugger Robot [Wed, 18 Apr 2018 17:07:13 +0000 (17:07 +0000)]
Merge "Fix merge isolated uid to host uid" into pi-dev
Cassie [Wed, 18 Apr 2018 17:05:44 +0000 (10:05 -0700)]
Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev
am:
27cd1f7e20
Change-Id: I66eebeab2f4a3c3029a437fc1bd717cc745c6051
Tim Murray [Wed, 18 Apr 2018 17:00:26 +0000 (10:00 -0700)]
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
am:
89b1a4ee0f
Change-Id: I9b8683effd9efccc7eb222e471d466bb529f451c
TreeHugger Robot [Wed, 18 Apr 2018 16:52:34 +0000 (16:52 +0000)]
Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev
Tim Murray [Wed, 18 Apr 2018 16:49:39 +0000 (16:49 +0000)]
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
Tim Murray [Tue, 17 Apr 2018 04:43:33 +0000 (21:43 -0700)]
ActivityManagerService: make bluetooth actually persistent
com.android.bluetooth was being marked as a persistent service in terms
of OOM adjustment, but it was only being marked as important foreground for
scheduling reasons. Make sure that persistent services are correctly
marked as persistent for the purposes of scheduling too.
bug
78197570
Test: dumpsys activity
Change-Id: Ieb2fe4253cac1202bd94a42356bb32f9e77b5637
Jason Monk [Wed, 18 Apr 2018 16:44:14 +0000 (09:44 -0700)]
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
am:
84208c724e
Change-Id: I95ea37a760470dcfdfb4ac9c1ab5c99c2fc72a5d
TreeHugger Robot [Wed, 18 Apr 2018 16:34:06 +0000 (16:34 +0000)]
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
David Brazdil [Wed, 18 Apr 2018 16:01:04 +0000 (09:01 -0700)]
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
am:
b914565f6a
Change-Id: I4fae1442aca58e45b98f18294b842697dc36dfb6
David Brazdil [Wed, 18 Apr 2018 15:52:58 +0000 (08:52 -0700)]
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev
am:
6644a0ec4f
Change-Id: I81145468853afae4af1f67c8d6a64d6e3158cad6
David Brazdil [Wed, 18 Apr 2018 15:48:50 +0000 (15:48 +0000)]
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
* changes:
Add more hidden API on light greylist
Add Thread.contextClassLoader to hidden API light greylist
David Brazdil [Wed, 18 Apr 2018 15:46:03 +0000 (08:46 -0700)]
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
am:
a74badbe26
Change-Id: Ib5d3e7b88977dbcbd7ce23564b6a8b7f7754566b
David Brazdil [Wed, 18 Apr 2018 15:35:39 +0000 (15:35 +0000)]
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev
David Brazdil [Wed, 18 Apr 2018 15:35:07 +0000 (15:35 +0000)]
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
Julia Reynolds [Wed, 18 Apr 2018 15:32:47 +0000 (08:32 -0700)]
Merge "Only show settings icon for set up users" into pi-dev
am:
c183cea754
Change-Id: I9cd5842bcb562d67f1d106566ff9102dc18d11b1
Julia Reynolds [Wed, 18 Apr 2018 15:24:03 +0000 (15:24 +0000)]
Merge "Only show settings icon for set up users" into pi-dev
Julia Reynolds [Wed, 18 Apr 2018 14:41:46 +0000 (07:41 -0700)]
Merge "Color and text changes" into pi-dev
am:
03ddb28cda
Change-Id: I0d66ab47686ef3d63d5a18bef890891a66261203
Jason Monk [Wed, 18 Apr 2018 14:37:19 +0000 (10:37 -0400)]
Slices: Don't use public namespace for internal intent
Test: manual
Change-Id: I21bc0a367456b58de195d71fc29cca0dbbca6927
Fixes:
78214697
Nicolas Geoffray [Wed, 18 Apr 2018 14:37:04 +0000 (07:37 -0700)]
Merge "Add UUID->mostSigBits to light grey." into pi-dev
am:
b1b2e0e92c
Change-Id: I101b25a04069142a2ac285e878194db26ab549a5
Android Build Merger (Role) [Wed, 18 Apr 2018 14:17:51 +0000 (14:17 +0000)]
Merge "Merge "Stop InCall Notification to avoid track leak" am:
b47c9019b5 am:
1105966734" into pi-dev-plus-aosp
Nicolas Geoffray [Wed, 18 Apr 2018 14:17:07 +0000 (07:17 -0700)]
Merge "Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey." into pi-dev
am:
7ed8513166
Change-Id: I1bb94d7366f4d47a4e7af39535ecbcec79175567
luochaojiang [Wed, 18 Apr 2018 14:17:04 +0000 (07:17 -0700)]
Merge "Stop InCall Notification to avoid track leak" am:
b47c9019b5
am:
1105966734
Change-Id: I367a09e58e6c651b7527f7a9ef2715bad79b5439
Julia Reynolds [Wed, 18 Apr 2018 14:01:20 +0000 (10:01 -0400)]
Only show settings icon for set up users
Test: manual inspection
Change-Id: Iec065269eaed7a906fafad332b1ef168f575773b
Fixes:
77548684
Nicolas Geoffray [Wed, 18 Apr 2018 14:07:22 +0000 (07:07 -0700)]
Merge "Add new light greylist APIs." into pi-dev
am:
c4c7321693
Change-Id: If9baa34ffbb99eae37780f09d51d3efdc0d6f32d
luochaojiang [Wed, 18 Apr 2018 14:05:23 +0000 (07:05 -0700)]
Merge "Stop InCall Notification to avoid track leak"
am:
b47c9019b5
Change-Id: I1bf6b52a8a82ddc5880871344a8f5af53ebf8322
TreeHugger Robot [Wed, 18 Apr 2018 14:01:01 +0000 (14:01 +0000)]
Merge "Color and text changes" into pi-dev
Nicolas Geoffray [Wed, 18 Apr 2018 13:58:04 +0000 (13:58 +0000)]
Merge "Add UUID->mostSigBits to light grey." into pi-dev
Nicolas Geoffray [Wed, 18 Apr 2018 13:57:48 +0000 (13:57 +0000)]
Merge "Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey." into pi-dev
Nicolas Geoffray [Wed, 18 Apr 2018 13:57:27 +0000 (13:57 +0000)]
Merge "Add new light greylist APIs." into pi-dev
Lin Guo [Wed, 18 Apr 2018 13:37:10 +0000 (06:37 -0700)]
Merge "Redo VolumeDialog with SeekbarListItem" into pi-dev
am:
c859806315
Change-Id: I1b5d53173e2a0e600a5a004270d1ae80826839fe
TreeHugger Robot [Wed, 18 Apr 2018 13:24:37 +0000 (13:24 +0000)]
Merge "Redo VolumeDialog with SeekbarListItem" into pi-dev
David Brazdil [Wed, 18 Apr 2018 13:22:03 +0000 (14:22 +0100)]
Add more hidden API on light greylist
Bug:
78210188
Bug:
78182899
Test: make
Change-Id: I9876ff6bc9477f51d6a5ba9370c6a1742210f86a
Dieter Hsu [Wed, 18 Apr 2018 13:17:31 +0000 (06:17 -0700)]
Merge "Add rank & count event to notification clicks and dismisses" into pi-dev
am:
afc909d3ba
Change-Id: I6ed76bcd0bc5d6dda4ad5b3ec42b56292d93ff18
Dieter Hsu [Wed, 18 Apr 2018 13:05:43 +0000 (13:05 +0000)]
Merge "Add rank & count event to notification clicks and dismisses" into pi-dev
Treehugger Robot [Wed, 18 Apr 2018 12:53:30 +0000 (12:53 +0000)]
Merge "Stop InCall Notification to avoid track leak"
Julia Reynolds [Wed, 18 Apr 2018 12:43:34 +0000 (08:43 -0400)]
Color and text changes
Change-Id: I2b1837ffd16911be20b5d5f9a7007ff3071265ab
Fixes:
78191129
Fixes:
77810424
Fixes:
78196346
Test: manual inspection
David Brazdil [Wed, 18 Apr 2018 12:35:15 +0000 (13:35 +0100)]
Delete hiddenapi-blacklist.txt file
The file is empty and not used, and its presence confuses people.
Remove it.
Bug:
64382372
Test: make
Change-Id: I8646a78b96d81dd38e5c58460d354430babd9d53
David Brazdil [Wed, 18 Apr 2018 12:33:53 +0000 (13:33 +0100)]
Sort hiddenapi-light-greylist.txt
Previous CL Ide42eacc8db4e403432ddd9d952495dda85db0ac left it
unsorted which makes it difficult to programatically add new APIs.
Bug:
64382372
Test: make
Change-Id: Iff35925d9ad64d8a98e59c1b8c4094d59a1c3a3c
David Brazdil [Wed, 18 Apr 2018 12:36:09 +0000 (13:36 +0100)]
Add Thread.contextClassLoader to hidden API light greylist
Bug:
78145123
Test: make
Change-Id: Iccd7c1c167c77c6bced619735114452e80a086f0
Adrian Roos [Wed, 18 Apr 2018 12:01:01 +0000 (05:01 -0700)]
Merge "Transitionless crashes" into pi-dev
am:
f921b507ea
Change-Id: I484f617b230ac50821f32cdf307dbb4d1edcd42a
TreeHugger Robot [Wed, 18 Apr 2018 11:50:03 +0000 (11:50 +0000)]
Merge "Transitionless crashes" into pi-dev
Bernie Innocenti [Wed, 18 Apr 2018 11:35:55 +0000 (04:35 -0700)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory" into pi-dev
am:
1b144e6dab
Change-Id: I3f833d428b6a8f28cf30529a633df04d32ced315
Bernie Innocenti [Wed, 18 Apr 2018 11:26:55 +0000 (11:26 +0000)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory" into pi-dev
Nicolas Geoffray [Wed, 18 Apr 2018 09:56:32 +0000 (10:56 +0100)]
Add new light greylist APIs.
bug:
78027167
Test: m
Change-Id: I6b9ef6534e1a0f50aac19909c04640b4b1f581ca
Nicolas Geoffray [Wed, 18 Apr 2018 09:38:24 +0000 (02:38 -0700)]
Merge "Add Landroid/app/IActivityManager;->getConfiguration() to light grey." into pi-dev
am:
ba199f56ca
Change-Id: Ie5a6becd04c53072510ea1bca26bc617da2fba0e
Nicolas Geoffray [Wed, 18 Apr 2018 09:28:20 +0000 (09:28 +0000)]
Merge "Add Landroid/app/IActivityManager;->getConfiguration() to light grey." into pi-dev
tiansiming [田思明] [Wed, 18 Apr 2018 09:28:14 +0000 (02:28 -0700)]
Merge "Remove duplicated code in IMMS" am:
5ab0fe1f56
am:
d54852ab76
Change-Id: Ia84f00aec9ab7f98804f583f9567ddd3216f7360
Shuo Qian [Wed, 18 Apr 2018 09:20:21 +0000 (02:20 -0700)]
Merge "Revert "Remove the OEM hook implementation and usage"" am:
e7a099149f
am:
1b5c97ced4
Change-Id: I5b86e206dd777c331d2a28c74472c328e2cc55f9
TreeHugger Robot [Wed, 18 Apr 2018 09:08:51 +0000 (09:08 +0000)]
Merge "resolve merge conflicts of
3108641d9e3652a4fdb17e430449e3f9aa16c1f3 to pi-dev-plus-aosp" into pi-dev-plus-aosp
Nicolas Geoffray [Wed, 18 Apr 2018 08:41:37 +0000 (01:41 -0700)]
Merge "Light grey android.media.MediaScanner.isNoMediaPath" into pi-dev
am:
a8527b9cb1
Change-Id: Iec693237e0c9d9532c0a2f5eeb5691578c27a1bf
Nicolas Geoffray [Wed, 18 Apr 2018 08:30:33 +0000 (08:30 +0000)]
Merge "Light grey android.media.MediaScanner.isNoMediaPath" into pi-dev
Nicolas Geoffray [Wed, 18 Apr 2018 08:21:34 +0000 (09:21 +0100)]
Add Landroid/app/IActivityManager;->getConfiguration() to light grey.
bug:
77327058
Test: m
Change-Id: I86d891e21c729a54450c8a92493303683152c07c
Neil Fuller [Wed, 18 Apr 2018 08:04:33 +0000 (09:04 +0100)]
resolve merge conflicts of
3108641d9e3652a4fdb17e430449e3f9aa16c1f3 to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I466b054aa9dc57cd77eb05054714ced424ca83ff
Nicolas Geoffray [Wed, 18 Apr 2018 07:59:15 +0000 (08:59 +0100)]
Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey.
bug:
77912446
Test: m
Change-Id: I81502667117a0584d150dc48d612a6a559dc3537
Neil Fuller [Wed, 18 Apr 2018 07:55:26 +0000 (00:55 -0700)]
Merge "Correct sendBroadcast test" into pi-dev
am:
587cf4105f
Change-Id: Iff263c19547757980914cf9afa9abc7294aca316
Neil Fuller [Wed, 18 Apr 2018 07:44:37 +0000 (07:44 +0000)]
Merge "Correct sendBroadcast test" into pi-dev
tiansiming [田思明] [Wed, 18 Apr 2018 05:20:18 +0000 (22:20 -0700)]
Merge "Remove duplicated code in IMMS"
am:
5ab0fe1f56
Change-Id: I6311c39ee5ea9abfa5b025315968d122f0d3f694
Aarthi Balachander [Wed, 18 Apr 2018 04:54:17 +0000 (21:54 -0700)]
Merge "add changes to make the add user button up to spec" into pi-dev
am:
5b510f5c7b
Change-Id: If2824fe6db7094dc9d2c674976eb5c1669b21f82
TreeHugger Robot [Wed, 18 Apr 2018 04:44:05 +0000 (04:44 +0000)]
Merge "add changes to make the add user button up to spec" into pi-dev
Treehugger Robot [Wed, 18 Apr 2018 04:09:28 +0000 (04:09 +0000)]
Merge "Remove duplicated code in IMMS"
Dieter Hsu [Fri, 13 Apr 2018 18:08:30 +0000 (02:08 +0800)]
Add rank & count event to notification clicks and dismisses
For click/action click/dismiss, passing rank(0-based) and
count at the time of the actions to events.
Bug:
70724602
Test: runtest systemui-notification
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/notification
Change-Id: I07c440f84ccb745f744eb4e317881b72d2b41683
Shuo Qian [Wed, 18 Apr 2018 02:57:45 +0000 (19:57 -0700)]
Merge "Revert "Remove the OEM hook implementation and usage""
am:
e7a099149f
Change-Id: Idb6e70da6b33f25d1cdce8ed5ed4b845b6237648
Wyatt Riley [Wed, 18 Apr 2018 02:46:35 +0000 (19:46 -0700)]
Merge "Adding Location Request History Foreground Tracking" into pi-dev
am:
a2b4cc9ea0
Change-Id: I723aecfec8dfdbd9af09b58c009f05ccdb904378
TreeHugger Robot [Wed, 18 Apr 2018 02:33:36 +0000 (02:33 +0000)]
Merge "Adding Location Request History Foreground Tracking" into pi-dev
Kevin Chyn [Wed, 18 Apr 2018 02:10:20 +0000 (19:10 -0700)]
Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev
am:
54926ba6a9
Change-Id: I151f4f09e2de5c7999b0ed13afa7b712781d468f
Kevin Chyn [Wed, 18 Apr 2018 01:53:39 +0000 (01:53 +0000)]
Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev
Shuo Qian [Wed, 18 Apr 2018 01:39:43 +0000 (01:39 +0000)]
Merge "Revert "Remove the OEM hook implementation and usage""
luochaojiang [Mon, 16 Apr 2018 08:55:03 +0000 (16:55 +0800)]
Stop InCall Notification to avoid track leak
There is no ringtone when a call is in comming. The audio track is
out of limit, for the notification tone can not be recycled timely.
Here is the steps to reproduce this issue.
1. Call the test device and keep it in communication
2. Send message to test device, more than 15 messages.
3. Stop call on test device, re-call the test device.
4. This is no ringtone now, if not, re try the previous steps.
Test: make, take a photo, record a video and play video
Change-Id: Iba4a41d7b8b601fa500b8a60cadaf04651f37fed
Signed-off-by: luochaojiang <luochaojiang@xiaomi.com>
tiansiming [田思明] [Tue, 17 Apr 2018 10:15:33 +0000 (18:15 +0800)]
Remove duplicated code in IMMS
There is no need to judge mIsInteractive again
Bug: N/A
Test: N/A
Change-Id: I887b5fdd16e4c39ff2dcf13902dfed69741635f8
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Michael Wachenschwanz [Wed, 18 Apr 2018 00:34:42 +0000 (17:34 -0700)]
Merge "Remove Persistent proccess without WTFing" into pi-dev
am:
4ea0a5a2df
Change-Id: I5438e638103171f33cfaf7d4d8c7538d93d61dd2
Julia Reynolds [Wed, 18 Apr 2018 00:29:01 +0000 (17:29 -0700)]
Merge "Group suppression shouldn't affect rating limiting" into pi-dev
am:
6b7b171dba
Change-Id: Idf731936ec21a04603f9d7aed64dadcece377328
TreeHugger Robot [Wed, 18 Apr 2018 00:16:24 +0000 (00:16 +0000)]
Merge "Remove Persistent proccess without WTFing" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 00:14:21 +0000 (00:14 +0000)]
Merge "Group suppression shouldn't affect rating limiting" into pi-dev
Pavlin Radoslavov [Tue, 17 Apr 2018 23:32:57 +0000 (16:32 -0700)]
Merge "Add A2DP Codec config hidden APIs to the greylist" into pi-dev
am:
d2b1d6d7b3
Change-Id: I1a98a6ddf01483b65bf4f82ffa971194debbd35c
TreeHugger Robot [Tue, 17 Apr 2018 23:16:22 +0000 (23:16 +0000)]
Merge "Add A2DP Codec config hidden APIs to the greylist" into pi-dev
Aarthi Balachander [Tue, 17 Apr 2018 18:13:17 +0000 (11:13 -0700)]
add changes to make the add user button up to spec
Test: tested on Mojave
Bug:
77869282
Change-Id: I75280675acf314734c9836babb7068a8379bf1c0
Dianne Hackborn [Tue, 17 Apr 2018 23:00:59 +0000 (16:00 -0700)]
Merge "Fix issue #
78138020: Improve app ops dumpsys" into pi-dev
am:
1074688a26
Change-Id: Iee4fd978316b2af3f950acb1edb00d85f8b19d32
Qingxi Li [Tue, 17 Apr 2018 22:46:07 +0000 (15:46 -0700)]
Merge "Add Global Settings to device whether show Carrier menu" into pi-dev
am:
ff03f0cfe4
Change-Id: Ia086ac7fcaa4faa45c9fce5463b700d735bec1f8
Sudheer Shanka [Tue, 17 Apr 2018 22:39:18 +0000 (15:39 -0700)]
Merge "Update Instrumentation.newActivity to pass non-null application." into pi-dev
am:
850c6662b0
Change-Id: I152d5029366aba600dc81ea6eb9113ff22fd1bec
TreeHugger Robot [Tue, 17 Apr 2018 22:34:10 +0000 (22:34 +0000)]
Merge "Fix issue #
78138020: Improve app ops dumpsys" into pi-dev
Chenjie Yu [Tue, 17 Apr 2018 22:20:21 +0000 (15:20 -0700)]
Fix merge isolated uid to host uid
Bug:
78190783
Fix:
78190783
Test: unit test
Change-Id: I71b5c575bf3c226509ebf088cb5dd961acd93459
Qingxi Li [Tue, 17 Apr 2018 22:20:59 +0000 (22:20 +0000)]
Merge "Add Global Settings to device whether show Carrier menu" into pi-dev
Evan Laird [Tue, 17 Apr 2018 22:11:24 +0000 (15:11 -0700)]
Merge "Use locale text direction in keyguard carrier text" into pi-dev
am:
f55385b595
Change-Id: I56c154b669de32f5ac6584c7e4a7546195ce4233
Sudheer Shanka [Tue, 17 Apr 2018 22:06:09 +0000 (22:06 +0000)]
Merge "Update Instrumentation.newActivity to pass non-null application." into pi-dev
Philip P. Moltmann [Tue, 17 Apr 2018 21:55:57 +0000 (14:55 -0700)]
Merge "Move PrintRecommendationService to systemAPI" into pi-dev
am:
e2890ae792
Change-Id: If575579592bc695c170da2c6e409a8304aefd1da
Todd Kennedy [Tue, 17 Apr 2018 21:50:27 +0000 (14:50 -0700)]
Merge "Load fallback categories earlier" into pi-dev
am:
d688e7b15d
Change-Id: I863c71a204d87e6d91229f553986efd708722324
Kevin Chyn [Tue, 17 Apr 2018 21:45:20 +0000 (14:45 -0700)]
Merge "Log before stopping/removing the current client" into pi-dev
am:
7b3e68232c
Change-Id: I8f669a41d60d18af911ff88380bd254521c99b47
TreeHugger Robot [Tue, 17 Apr 2018 21:42:32 +0000 (21:42 +0000)]
Merge "Use locale text direction in keyguard carrier text" into pi-dev
Philip P. Moltmann [Tue, 17 Apr 2018 21:38:29 +0000 (14:38 -0700)]
Merge "Enable multi-cast while resolving nsd services" into pi-dev
am:
da80202bae
Change-Id: I6b44a933f9633d70ffb57034a8e8a6d23f8b028e
Pavlin Radoslavov [Tue, 17 Apr 2018 21:35:19 +0000 (14:35 -0700)]
Add A2DP Codec config hidden APIs to the greylist
Bug:
78187319
Test: Code compilation
Change-Id: Ide42eacc8db4e403432ddd9d952495dda85db0ac
TreeHugger Robot [Tue, 17 Apr 2018 21:10:39 +0000 (21:10 +0000)]
Merge "Move PrintRecommendationService to systemAPI" into pi-dev
Daniel Bonnevier [Tue, 17 Apr 2018 21:03:13 +0000 (14:03 -0700)]
Merge "Correct sendBroadcast test"
am:
1cb379b782
Change-Id: Ic533da3300a2227f8b9b002fe305daed27beea38
Julia Reynolds [Tue, 17 Apr 2018 21:01:51 +0000 (14:01 -0700)]
Merge "Exclude system notifications from visual suppression" into pi-dev
am:
f9e4ccfe87
Change-Id: I78e901797871b9849fc65454146851002c188c65
Kevin Chyn [Tue, 17 Apr 2018 20:50:53 +0000 (13:50 -0700)]
Don't delay the FINGERPRINT_ERROR_CANCELED message
Test: tested with test APK
Change-Id: Ic975870c6f815b5f7dfa4c7f2d8bf5554fbb1c5b
Fixes:
78185698
Beverly [Tue, 17 Apr 2018 20:41:00 +0000 (13:41 -0700)]
Merge "All users will hear charging sounds." into pi-dev
am:
e5c9cc124a
Change-Id: I406dde16f874a7b2814270a53efe0458b0c06d52
David Chen [Tue, 17 Apr 2018 20:35:20 +0000 (13:35 -0700)]
Merge "Adds option to drop small buckets for statsd." into pi-dev
am:
bbc057444f
Change-Id: I1ab4de808eef9e7f0ef78a4ea336db9a83420c02
Yi Jin [Tue, 17 Apr 2018 20:28:08 +0000 (13:28 -0700)]
Merge "Free allocated varargs" into pi-dev
am:
c3116634e1
Change-Id: Iaa62f67364a7f5d34b578b319cd1a06b565db5b8
Evan Laird [Tue, 17 Apr 2018 20:22:50 +0000 (16:22 -0400)]
Use locale text direction in keyguard carrier text
Test: visual in RTL
Change-Id: I5209c863e784a2720a338b03aa1ecafe2c9250d6
Fixes:
66995981
TreeHugger Robot [Tue, 17 Apr 2018 20:21:30 +0000 (20:21 +0000)]
Merge "Load fallback categories earlier" into pi-dev