OSDN Git Service
Kenny Guy [Wed, 18 Apr 2018 19:34:49 +0000 (12:34 -0700)]
Merge "Record timestamp when brightness tracker is called" into pi-dev
am:
eb432b1092
Change-Id: I975e90016eb93d15f4fb04f724dc526835f51f13
Rob Carr [Wed, 18 Apr 2018 19:27:38 +0000 (12:27 -0700)]
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
am:
3ef2d6d9d8
Change-Id: I6c14d19d72d03d975e6b1e34b00fc9ac879e4811
TreeHugger Robot [Wed, 18 Apr 2018 19:09:25 +0000 (19:09 +0000)]
Merge "Record timestamp when brightness tracker is called" into pi-dev
Evan Laird [Wed, 18 Apr 2018 19:06:29 +0000 (12:06 -0700)]
Merge "Don't apply corner cutout insets if we're already inset enough" into pi-dev
am:
f0cbbff692
Change-Id: I8c0e23fcac114f7dc41bf45f60b75408ab53a5bf
Tim Murray [Wed, 18 Apr 2018 19:00:26 +0000 (12:00 -0700)]
Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev
am:
3148dbf80d
Change-Id: Ia7902146d83b84c5b22ec21770de359834a4a935
Rob Carr [Wed, 18 Apr 2018 18:59:43 +0000 (18:59 +0000)]
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
Todd Kennedy [Wed, 18 Apr 2018 18:52:34 +0000 (11:52 -0700)]
Merge "Don't consider resources < 0 as invalid" into pi-dev
am:
6fc7e38bbe
Change-Id: I649f0e947771a9d8d1c74bbbb2aed8ae5bd3b960
TreeHugger Robot [Wed, 18 Apr 2018 18:48:53 +0000 (18:48 +0000)]
Merge "Don't apply corner cutout insets if we're already inset enough" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 18:48:48 +0000 (18:48 +0000)]
Merge "ActivityManagerService: ensure updateOomAdjLocked gets called early" into pi-dev
Jeff Sharkey [Wed, 18 Apr 2018 18:41:52 +0000 (11:41 -0700)]
Merge "Grant notification Uri permissions as sending app." into pi-dev
am:
56487413b7
Change-Id: I2c04b6d22bdb5f8265cdfe56bf46de6a92d3d369
Dan Cashman [Wed, 18 Apr 2018 18:35:58 +0000 (11:35 -0700)]
Merge "Add AccountManager key rotation awareness." into pi-dev
am:
3091d60a70
Change-Id: Ife05dbf2b6e138ef928e597d42c99a12997e7b74
TreeHugger Robot [Wed, 18 Apr 2018 18:33:36 +0000 (18:33 +0000)]
Merge "Don't consider resources < 0 as invalid" into pi-dev
Yu-Han Yang [Wed, 18 Apr 2018 18:26:49 +0000 (11:26 -0700)]
Merge "Add setting for GNSS location request update duration" into pi-dev
am:
af52d9815a
Change-Id: If268c45fa38671ebe17b4f7c0c9d58b2029cea48
Jeff Sharkey [Wed, 18 Apr 2018 18:18:48 +0000 (18:18 +0000)]
Merge "Grant notification Uri permissions as sending app." into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 18:14:34 +0000 (18:14 +0000)]
Merge "Add AccountManager key rotation awareness." into pi-dev
Shuo Qian [Wed, 18 Apr 2018 18:12:20 +0000 (11:12 -0700)]
[automerger skipped] Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev
am:
e116dcc57c -s ours
Change-Id: Ia6518f01fd5dfec3909bac318f0596ed83013bcf
TreeHugger Robot [Wed, 18 Apr 2018 18:10:04 +0000 (18:10 +0000)]
Merge "Add setting for GNSS location request update duration" into pi-dev
Kenny Guy [Wed, 18 Apr 2018 17:42:10 +0000 (18:42 +0100)]
Record timestamp when brightness tracker is called
Associate the brightness slider event timestamp with
the time the tracker is called rather than when
the background handler handles the call.
Bug:
78224086
Test: atest BrightnessTrackerTest
Change-Id: I083fdcc10f223ab7398911d9cb63dca5d8681fc4
Shuo Qian [Wed, 18 Apr 2018 17:50:31 +0000 (17:50 +0000)]
Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev
Matthew Ng [Wed, 18 Apr 2018 17:42:49 +0000 (10:42 -0700)]
Merge "Fixes no vibration on old nav bar" into pi-dev
am:
73f8361354
Change-Id: I4e6cac63be2557e22cb690d3ef680b09faed93a2
Tracy Zhou [Wed, 18 Apr 2018 17:37:51 +0000 (10:37 -0700)]
Merge "Revert "Fix "Screen is pinned" dialog not showing completely in multi-window"" into pi-dev
am:
e3b59d6376
Change-Id: I908e8f914b58d8c80873256bbea95e3f45ab9e3a
Dianne Hackborn [Wed, 18 Apr 2018 17:29:59 +0000 (10:29 -0700)]
Merge "Fix issue #
74248644: Swiping away task increments start ID of running services" into pi-dev
am:
32643c6644
Change-Id: I9c3b0ebb63ba46bfcbdf26f46476048d8b53f6c4
Todd Kennedy [Tue, 17 Apr 2018 16:55:31 +0000 (09:55 -0700)]
Don't consider resources < 0 as invalid
The only invalid resource ID is '0'. All other resource IDs are
valid; even negative resource IDs.
With the introduction of namespaces in AAPT2, resource IDs start with
0x80, 0x81, ... [ie. because Java only supports signed types, they are
considered negative]. For app transition animations negative resource
IDs were incorrectly considered "invalid".
Change-Id: I24032baa54860459d4f1b8e17a80c760c48d5579
Fixes:
70716301
Test: Manual. Run multi-split APK and see that transition animations work when defined in a split
TreeHugger Robot [Wed, 18 Apr 2018 17:27:33 +0000 (17:27 +0000)]
Merge "Fixes no vibration on old nav bar" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 17:25:00 +0000 (17:25 +0000)]
Merge "Revert "Fix "Screen is pinned" dialog not showing completely in multi-window"" into pi-dev
Tracy Zhou [Mon, 16 Apr 2018 20:36:37 +0000 (20:36 +0000)]
Revert "Fix "Screen is pinned" dialog not showing completely in multi-window"
This reverts commit
be26707695e3cf4785e716b9814a067d50cd1123.
Reason for revert: Caused regression in b/
77976945
Fixes:
77976945
Bug:
73513388
Change-Id: I8c83a823d7421563ea5a2eab2e20cb2b06ec6068
TreeHugger Robot [Wed, 18 Apr 2018 17:21:11 +0000 (17:21 +0000)]
Merge "Fix issue #
74248644: Swiping away task increments start ID of running services" into pi-dev
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:43:39 +0000 (09:43 -0700)]
ActivityManagerService: ensure updateOomAdjLocked gets called early
If updateOomAdjLocked isn't called before android.bg is put into the bg
cpuset, then updateOomAdjLocked will put android.bg in the fg cpuset.
Test: boots
Bug:
77908520
Change-Id: If88a6a59f4ca4fe7d1c6ed149f59282aad26600a
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
Jeff Sharkey [Tue, 17 Apr 2018 18:16:20 +0000 (12:16 -0600)]
Grant notification Uri permissions as sending app.
For security reasons, the system UID can't make URI permission as
itself; it always needs to do so on behalf of a specific app. To
handle this, we grant notification Uri permissions as the UID that
sent a given notification.
To give meaningful debug messages to developers, check to see if the
caller has permissions to grant Uri access when they're enqueuing
a notification. If they're targeting P, throw any security issues
back at the caller; if older SDK, log and ignore that Uri.
Since multiple notifications can grant access to the same content,
we need unique UriPermissionOwner per active notification. For
example, consider these two notifications:
1. sound=content://sound, image=content://image1
2. sound=content://sound, image=content://image2
When #1 is cancelled, we still need to keep the content://sound
grant active until #2 is also cancelled. Using unique owners
means that ActivityManagerService tracks reference counting on
our behalf.
Optimizations to avoid allocations in hot code paths.
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Bug:
9069730
Change-Id: I69601793538adcbf06c4986a2fb1ea2dd9d876eb
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
sqian [Tue, 17 Apr 2018 18:54:14 +0000 (11:54 -0700)]
Revert "Remove the OEM hook implementation and usage"
This reverts commit
2635a89c8cb536d487c5a77ea205f787c19dc92e.
Bug:
34344851
Test: Treehugger
Change-Id: I96697165fd75054de42f007c16ca294ed6725708
Merged-In: I96697165fd75054de42f007c16ca294ed6725708
(cherry picked from commit
00b89515a54b7f8d635408994c6384fb80fe2127)
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>
OSDN Git Service
