Tim Murray
d4e5725d45
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev am: 89b1a4ee0f
...
am: efff5fcb8e
2018-04-18 10:09:58 -07:00
Tim Murray
efff5fcb8e
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
...
am: 89b1a4ee0f
2018-04-18 10:00:26 -07:00
Jason Monk
23f45739c7
Merge "Slices: Don't use public namespace for internal intent" into pi-dev am: 84208c724e
...
am: 86e2a2ab32
2018-04-18 09:52:25 -07:00
Tim Murray
89b1a4ee0f
Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
2018-04-18 16:49:39 +00:00
Tim Murray
e010b418ec
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
2018-04-18 09:47:51 -07:00
Jason Monk
86e2a2ab32
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
...
am: 84208c724e
2018-04-18 09:44:14 -07:00
TreeHugger Robot
84208c724e
Merge "Slices: Don't use public namespace for internal intent" into pi-dev
2018-04-18 16:34:06 +00:00
David Brazdil
73b40cb33e
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev am: b914565f6a
...
am: cb877aae0e
2018-04-18 09:12:32 -07:00
David Brazdil
1d92d67281
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev am: 6644a0ec4f
...
am: f33e055201
2018-04-18 09:04:52 -07:00
David Brazdil
cb877aae0e
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
...
am: b914565f6a
2018-04-18 09:01:04 -07:00
David Brazdil
cdb0b874b0
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev am: a74badbe26
...
am: f7149415a7
2018-04-18 08:56:42 -07:00
David Brazdil
f33e055201
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev
...
am: 6644a0ec4f
2018-04-18 08:52:58 -07:00
David Brazdil
b914565f6a
Merge changes I9876ff6b,Iccd7c1c1 into pi-dev
...
* changes:
Add more hidden API on light greylist
Add Thread.contextClassLoader to hidden API light greylist
2018-04-18 15:48:50 +00:00
David Brazdil
f7149415a7
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
...
am: a74badbe26
2018-04-18 08:46:03 -07:00
Julia Reynolds
ade3b964a2
Merge "Only show settings icon for set up users" into pi-dev am: c183cea754
...
am: 98ff6c855e
2018-04-18 08:42:03 -07:00
David Brazdil
6644a0ec4f
Merge "Delete hiddenapi-blacklist.txt file" into pi-dev
2018-04-18 15:35:39 +00:00
David Brazdil
a74badbe26
Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
2018-04-18 15:35:07 +00:00
Julia Reynolds
98ff6c855e
Merge "Only show settings icon for set up users" into pi-dev
...
am: c183cea754
2018-04-18 08:32:47 -07:00
Julia Reynolds
c183cea754
Merge "Only show settings icon for set up users" into pi-dev
2018-04-18 15:24:03 +00:00
Julia Reynolds
e6fc382fcc
Merge "Color and text changes" into pi-dev am: 03ddb28cda
...
am: 8e7df9edb2
2018-04-18 07:53:38 -07:00
Nicolas Geoffray
5b1e2fe99f
Merge "Add UUID->mostSigBits to light grey." into pi-dev am: b1b2e0e92c
...
am: 51a5fe93b8
2018-04-18 07:45:39 -07:00
Julia Reynolds
8e7df9edb2
Merge "Color and text changes" into pi-dev
...
am: 03ddb28cda
2018-04-18 07:41:46 -07:00
Jason Monk
0c179a94a9
Slices: Don't use public namespace for internal intent
...
Test: manual
Change-Id: I21bc0a367456b58de195d71fc29cca0dbbca6927
Fixes: 78214697
2018-04-18 10:37:19 -04:00
Nicolas Geoffray
51a5fe93b8
Merge "Add UUID->mostSigBits to light grey." into pi-dev
...
am: b1b2e0e92c
2018-04-18 07:37:04 -07:00
luochaojiang
aa7549235d
Merge "Merge "Stop InCall Notification to avoid track leak" am: b47c9019b5 am: 1105966734" into pi-dev-plus-aosp
...
am: e89aa91d11
2018-04-18 07:35:03 -07:00
Nicolas Geoffray
9d84084d3e
Merge "Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey." into pi-dev am: 7ed8513166
...
am: 1093c998a4
2018-04-18 07:25:04 -07:00
Android Build Merger (Role)
e89aa91d11
Merge "Merge "Stop InCall Notification to avoid track leak" am: b47c9019b5 am: 1105966734" into pi-dev-plus-aosp
2018-04-18 14:17:51 +00:00
Nicolas Geoffray
e29d0c0855
Merge "Add new light greylist APIs." into pi-dev am: c4c7321693
...
am: e50a94af18
2018-04-18 07:17:19 -07:00
Nicolas Geoffray
1093c998a4
Merge "Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey." into pi-dev
...
am: 7ed8513166
2018-04-18 07:17:07 -07:00
luochaojiang
48df3eb5de
Merge "Stop InCall Notification to avoid track leak" am: b47c9019b5
...
am: 1105966734
2018-04-18 07:17:04 -07:00
Julia Reynolds
69743ab909
Only show settings icon for set up users
...
Test: manual inspection
Change-Id: Iec065269eaed7a906fafad332b1ef168f575773b
Fixes: 77548684
2018-04-18 14:12:48 +00:00
Nicolas Geoffray
e50a94af18
Merge "Add new light greylist APIs." into pi-dev
...
am: c4c7321693
2018-04-18 07:07:22 -07:00
luochaojiang
1105966734
Merge "Stop InCall Notification to avoid track leak"
...
am: b47c9019b5
2018-04-18 07:05:23 -07:00
TreeHugger Robot
03ddb28cda
Merge "Color and text changes" into pi-dev
2018-04-18 14:01:01 +00:00
Nicolas Geoffray
b1b2e0e92c
Merge "Add UUID->mostSigBits to light grey." into pi-dev
2018-04-18 13:58:04 +00:00
Nicolas Geoffray
7ed8513166
Merge "Add Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; to light grey." into pi-dev
2018-04-18 13:57:48 +00:00
Nicolas Geoffray
c4c7321693
Merge "Add new light greylist APIs." into pi-dev
2018-04-18 13:57:27 +00:00
Lin Guo
b60ef5f187
Merge "Redo VolumeDialog with SeekbarListItem" into pi-dev am: c859806315
...
am: da1f6fec55
2018-04-18 06:49:04 -07:00
Lin Guo
da1f6fec55
Merge "Redo VolumeDialog with SeekbarListItem" into pi-dev
...
am: c859806315
2018-04-18 06:37:10 -07:00
Dieter Hsu
0e14c74f09
Merge "Add rank & count event to notification clicks and dismisses" into pi-dev am: afc909d3ba
...
am: 64df7a46e0
2018-04-18 06:31:01 -07:00
TreeHugger Robot
c859806315
Merge "Redo VolumeDialog with SeekbarListItem" into pi-dev
2018-04-18 13:24:37 +00:00
David Brazdil
df15897b07
Add more hidden API on light greylist
...
Bug: 78210188
Bug: 78182899
Test: make
Change-Id: I9876ff6bc9477f51d6a5ba9370c6a1742210f86a
2018-04-18 14:22:03 +01:00
Dieter Hsu
64df7a46e0
Merge "Add rank & count event to notification clicks and dismisses" into pi-dev
...
am: afc909d3ba
2018-04-18 06:17:31 -07:00
Dieter Hsu
afc909d3ba
Merge "Add rank & count event to notification clicks and dismisses" into pi-dev
2018-04-18 13:05:43 +00:00
Treehugger Robot
b47c9019b5
Merge "Stop InCall Notification to avoid track leak"
2018-04-18 12:53:30 +00:00
Julia Reynolds
6013e5cc96
Color and text changes
...
Change-Id: I2b1837ffd16911be20b5d5f9a7007ff3071265ab
Fixes: 78191129
Fixes: 77810424
Fixes: 78196346
Test: manual inspection
2018-04-18 08:45:12 -04:00
David Brazdil
06b59756fa
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
2018-04-18 13:37:45 +01:00
David Brazdil
02795c946f
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
2018-04-18 13:37:45 +01:00
David Brazdil
eb73af62fb
Add Thread.contextClassLoader to hidden API light greylist
...
Bug: 78145123
Test: make
Change-Id: Iccd7c1c167c77c6bced619735114452e80a086f0
2018-04-18 13:37:45 +01:00
Adrian Roos
bf813dbdb2
Merge "Transitionless crashes" into pi-dev am: f921b507ea
...
am: b2920eb245
2018-04-18 05:14:56 -07:00
