Commit Graph

87281 Commits

Author SHA1 Message Date
TreeHugger Robot
14c651bb7b Merge "Notify AutofillManager in onResume() IFF activity was not recreated." 2018-11-21 23:57:15 +00:00
Benson Li
3328a2ca25 Merge "HFP: Send caller ID in +CLIP command (1/4)" am: 6c4c8aeb70 am: d09c0d88e4
am: 66ba8e8dbc

Change-Id: I1ecad6c8d3defd67fd06cb25c32243cd7c4f80a3
2018-11-21 13:39:39 -08:00
Benson Li
66ba8e8dbc Merge "HFP: Send caller ID in +CLIP command (1/4)" am: 6c4c8aeb70
am: d09c0d88e4

Change-Id: Ic628b5d6b3e4062388523f008ad4257c27bae71d
2018-11-21 13:22:43 -08:00
Treehugger Robot
6c4c8aeb70 Merge "HFP: Send caller ID in +CLIP command (1/4)" 2018-11-21 20:21:19 +00:00
Dianne Hackborn
07d5fc8691 Merge "Add new API to performing grouping and ordering of bindings." 2018-11-21 19:16:53 +00:00
Wei Wang
2ca566b525 Merge "Add thermal status API for app and unit test" 2018-11-21 18:34:49 +00:00
Beverly Tai
8db41f6bef Merge "Override equals in Person object" 2018-11-21 18:24:52 +00:00
Dianne Hackborn
a631d56cf3 Add new API to performing grouping and ordering of bindings.
This will allow apps to better manage many isolated processes,
telling the system how they are grouped together (so should be
managed as one related entity within the LRU cache) and fine-tune
the ordering within that group.

The API is not yet tested...  though in theory it is implemented.
But the implementation done for that also fixes a *lot* of problems
with activity LRU management that, even without groups, should
make the ordering of processes in the LRU list much more consistently
match how recently the user has interacted with it.

Also clean up some of the new dumpsys output in the activity manager:
move the new sections to before the process output (so it is still
easy to see the process state at the end of the output), and add and
document the command line options for controlling them.  And add a
new "lru" section that gives a clear view of what is going on with
the raw LRU list.

An upcoming change will add tests for the new grouping functionality,
and probably some fixes resulting from that.

Test: atest CtsAppTestCases:ServiceTest
Bug: 111434506
Change-Id: I1f6b6b9de66ccde1573e1a0e9615e8c5f8e6c0d7
2018-11-21 09:13:21 -08:00
Neil Fuller
f35dd4fa6c Merge "API for retrieving time zone IDs by country" am: 4492ec573a
am: b5ab9c2e1f

Change-Id: I69b477e36d760e5d06c232fc7fd0891d98dd52b6
2018-11-21 07:55:55 -08:00
Neil Fuller
4492ec573a Merge "API for retrieving time zone IDs by country" 2018-11-21 15:18:27 +00:00
Louis Pullen-Freilich
e4205126ee Merge "Deprecates framework Preference classes" 2018-11-21 14:42:43 +00:00
Mihai Popa
c6950296fe [Magnifier-65] Separate builder defaults
Bug: 72211470
Test: manual testing
Change-Id: I235a0cd15dd2156a8510023ba983ef06822ca7da
2018-11-21 09:14:17 +00:00
Eran Messeri
fdf99084ed Merge "Grant Device IDs access to Profile Owner" 2018-11-21 07:26:40 +00:00
Jeff Sharkey
b071c47451 Merge "Define roles for Gallery and Music apps." 2018-11-21 05:05:13 +00:00
TreeHugger Robot
df1d8ea70b Merge "settings command delete by user" 2018-11-21 04:08:00 +00:00
Jack Yu
af2218bde6 Merge "Move hidden APIs into system APIs" am: 860d8d0d80
am: c3375240ba

Change-Id: Ibe6fa27d99791e57b1253a9dc990de0706b52fb6
2018-11-20 19:04:24 -08:00
Jack Yu
860d8d0d80 Merge "Move hidden APIs into system APIs" 2018-11-21 02:40:30 +00:00
Hansong Zhang
af3d69b258 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4 am: 652dffda0b
am: a7063f1830

Change-Id: Ib879f947b1db9579ec46efc79351a3b9247c09c8
2018-11-20 18:35:26 -08:00
Hansong Zhang
a7063f1830 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4
am: 652dffda0b

Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18
2018-11-20 18:23:10 -08:00
Treehugger Robot
215a48cff4 Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" 2018-11-21 01:58:32 +00:00
Stanley Tng
a944152a99 Merge "Enable the Debug Logs for Hearing Aids Profile" am: 7271c452a9 am: b6987e3c3c
am: 56f272547f

Change-Id: I1a664cf14d7f132abb9919fb3ba11d111fbb1e7b
2018-11-20 17:55:08 -08:00
Stanley Tng
56f272547f Merge "Enable the Debug Logs for Hearing Aids Profile" am: 7271c452a9
am: b6987e3c3c

Change-Id: I4708bea946177b47beb78845a49f082df96e7ede
2018-11-20 17:43:46 -08:00
TreeHugger Robot
a8d438fdd3 Merge "Add role initialization to RoleControllerService." 2018-11-21 01:27:56 +00:00
Treehugger Robot
7271c452a9 Merge "Enable the Debug Logs for Hearing Aids Profile" 2018-11-21 01:20:02 +00:00
Hai Zhang
8e60a8fd1b Add role initialization to RoleControllerService.
This change adds RoleManager.setRoleNamesFromController() to allow
RoleControllerService to initialize the roles for a user. This change
also fixes the persistence of roles by calling writeAsyncLocked().

Bug: 110557011
Test: build
Change-Id: I921b6aa691478ca4c0dd1a75fc929a96ce1e7df5
2018-11-20 15:14:58 -08:00
TreeHugger Robot
39a498066f Merge "Add mechanism to send assist data to a IntelligenceService" 2018-11-20 22:55:57 +00:00
Wei Wang
37b175448a Add thermal status API for app and unit test
Test: Manually on Thermal HAL 2.0 device
Test: Manually on Thermal HAL 1.1 device
Test: Manually on no Thermal HAL emulator
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java
Bug: 111086696
Bug: 119413961
Change-Id: I6723406123d12339e82e9e87eec14b7f9a301897
2018-11-20 11:56:30 -08:00
Andrew Solovay
8a30c09238 Merge "docs: Removing @see link to hidden field" into pi-dev
am: 807672ac4f

Change-Id: If1d5759ea1f2fe0656e298c2d67d3f817158ebba
2018-11-20 11:08:29 -08:00
Jack Yu
8f707bb8e5 Merge "Move hidden APIs into system APIs" 2018-11-20 18:56:32 +00:00
Winson Chung
fbbb158da6 Add mechanism to send assist data to a IntelligenceService
- Proxy requested assist data from swipe up through the the
  IntelligenceServiceManager to AiAi for each activity that we receive
  assist data for (the AssistDataReceiver to be removed later once AiAi
  implements the new IntelligenceService interface).

Bug: 117268952
Test: Build dummy intelligence service, ensure that we get capture event
      on swipe up.

Change-Id: Iec29792932d30e94a702bd5079711c6615d0738a
2018-11-20 10:08:59 -08:00
TreeHugger Robot
d0f47278c4 Merge "Fix role granting flow." 2018-11-20 17:52:54 +00:00
Jeff Sharkey
ce80ed4490 Merge "Define app-ops for new storage permissions in Q." 2018-11-20 17:34:21 +00:00
Nicholas Sauer
3d87d1e525 settings command delete by user
bug: 118492733
Test: $ adb shell settings --user 10 put secure autofill_service blah
$ adb shell settings --user 10 get secure autofill_service
blah
$ adb shell settings --user 10 delete secure autofill_service
$ adb shell settings --user 10 get secure autofill_service
null

Change-Id: I771bf8e148898703332ead8162c5f9fe4863ea74
2018-11-20 09:09:58 -08:00
Beverly
e98937afe3 Override equals in Person object
Test: atest NotificationDataTest
Change-Id: I8423a40c6f0ccf6d9cd0c3141487b84679d966ff
Fixes: 119029933
2018-11-20 11:01:00 -05:00
TreeHugger Robot
d26b8bc796 Merge "resolve merge conflicts of 183271d1d2 to master" 2018-11-20 15:23:40 +00:00
yuanjiahsu
b39b469b12 resolve merge conflicts of 183271d1d2 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I219a85189fb4207a0605ca541f8ecc29f5ee6808
2018-11-20 20:55:49 +08:00
Mihai Popa
a5c84f2980 Merge "[Magnifier-57] Add API to set overlay" 2018-11-20 11:14:28 +00:00
Neil Fuller
6caa954ead API for retrieving time zone IDs by country
New method has been requested by Setup Wizard.

Test: CTS: run cts-dev -m CtsUtilTestCases -t android.util.cts.TimeUtilsTest
Bug: 116544863
Merged-In: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
Change-Id: I31a9e3d07d5c3fbc8ba1d9c9b398cb2661aa71f9
(cherry picked from commit f9bb2d8f02)
2018-11-20 10:59:18 +00:00
Neil Fuller
9347978d5f Merge "API for retrieving time zone IDs by country" 2018-11-20 09:33:24 +00:00
Yuanjia Hsu
183271d1d2 Merge "Modify feature flag of Personal Safety" am: b4a197ca39
am: 4f4e52c1b9

Change-Id: Iebde195a7f6fd86cae357169fae76368df9727b4
2018-11-19 23:12:33 -08:00
Yuanjia Hsu
b4a197ca39 Merge "Modify feature flag of Personal Safety" 2018-11-20 06:39:55 +00:00
Zimuzo Ezeozue
621a683ea7 Merge "Add privileged API to control keyguard secure notifications" 2018-11-20 04:50:52 +00:00
Hai Zhang
b295ac4793 Fix role granting flow.
This change fixes various issues realted to the role granting
flow, including allowing permission controller to be granted
SET_PREFERRED_APPLICATIONS for roles, granting
MANAGE_ROLE_HOLDERS permission to shell, and improving
RoleUserState XML parsing.

Bug: 110557011
Test: build
Change-Id: Ia095580ad497af9cf7b29e6bedab70046b09d542
2018-11-20 01:09:33 +00:00
Jeff Sharkey
d2a1f0d693 Define app-ops for new storage permissions in Q.
Mostly mirrored off existing READ/WRITE_EXTERNAL_STORAGE app-ops,
but with new Aural/Visual runtime permission groups called out.

Bug: 117777783
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ibeb93428b6a20b33879117e455e9ef63af58f79e
2018-11-19 18:07:35 -07:00
Etan Cohen
5faec91513 Merge "Add IPv6 link-local address generation from EUI-48" am: a2a9df3e3a
am: 674479afe5

Change-Id: I63de4fa185649d9389a771860c479899e90b37e4
2018-11-19 16:48:22 -08:00
Felipe Leme
2eadd14d5a Merge "Minor changes on IntelligenceManager APIs." 2018-11-20 00:09:31 +00:00
Eugene Susla
973334dae7 Merge "Flip appops corresponding to default-granted permissions" 2018-11-19 23:17:03 +00:00
Andrew Solovay
6fe332c07e docs: Removing @see link to hidden field
Docs had contained a @see link to #FIRST_SDK_INT , but that field
had a @hide directive, so the @see link resulted in an error message
in the output.

Doc staged to:

http://go/dac-stage/reference/android/os/Build.VERSION#SDK_INT

Bug: 80445154
Test: make ds-docs
Change-Id: Id8d461c517bd4d8b3c49b61da37ec0a16768a63d
Exempt-From-Owner-Approval: Doc-only change
2018-11-19 23:02:47 +00:00
TreeHugger Robot
5a31e0e77d Merge "Add Intent#EXTRA_CONTENT_QUERY." 2018-11-19 22:52:11 +00:00
Jack Yu
4f956e0fca Move hidden APIs into system APIs
To allow vendor code to construct LinkAddress, which is
one of the parameter in the system API DataCallResponse.

Test: Build
Bug: 73659459
Merged-In: I3e203781d3a03285fa0e047cc8837ccb4a09016a
Change-Id: I3e203781d3a03285fa0e047cc8837ccb4a09016a
2018-11-19 14:40:13 -08:00