Commit Graph

447924 Commits

Author SHA1 Message Date
Jeff Sharkey
72f1fffe8b Move default ringtone configuration to framework.
This ensures that partners have a place to customize the default
ringtone configuration, such as adding support for per-SIM ringtones
which aren't officially supported by Android yet.

Bug: 141596983, 141518853, 141594113, 141595768, 141809410
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ibe5b41c09ca40caadfcbb81162b996173fe8509b
2019-10-18 11:55:57 -06:00
TreeHugger Robot
5a1d791ebf Merge "Don't store copies of notifications for logging" 2019-10-18 15:40:05 +00:00
Bill Yi
1e88454041 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 7c1a8a42ed -s ours
am: 2d4c7f4d00 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib5048a24d391adb4cbe3e0ef235e14e814fc855c
2019-10-18 08:38:11 -07:00
Tyler Gunn
affa2ff5c3 Merge "Telecom API updates for mainline support." 2019-10-18 15:35:20 +00:00
Bill Yi
2d4c7f4d00 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 7c1a8a42ed -s ours
am skip reason: subject contains skip directive

Change-Id: If8db3ca8911802e19a62991e5d820de74fff47e7
2019-10-18 08:30:31 -07:00
TreeHugger Robot
7c1a8a42ed Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-10-18 15:09:52 +00:00
Alan Stokes
00e36a17d0 Merge "Move more fields to InstallSource." 2019-10-18 15:06:16 +00:00
Adrian Roos
e301ccf8cf Merge "protolog: improve build time of frameworks/base/services" 2019-10-18 14:57:49 +00:00
Louis Chang
cea1989657 Merge "Fix AppTaskTests#testStartActivityInTask_NewTask failure" 2019-10-18 14:56:02 +00:00
Ned Burns
fb963a7a22 Merge "Make FeatureFlags a singleton" 2019-10-18 14:55:42 +00:00
Beverly
5db227d236 Don't store copies of notifications for logging
We only need to retain the String representation
of the event

Test: manual
Fixes: 142823448
Change-Id: I907143e5a5f87c9a561e3d23cd365243c9901ee3
2019-10-18 13:56:24 +00:00
Eran Messeri
111dfdfdae Merge "Documentation: Indicate DPM method does I/O" 2019-10-18 13:10:51 +00:00
TreeHugger Robot
1ea7ca442d Merge "Fix grammatical error in DPM" 2019-10-18 12:45:48 +00:00
Roshan Pius
2cff702187 Merge "Create a filegroup for utilities used by wifi" 2019-10-18 12:00:45 +00:00
Eran Messeri
128703b70d Documentation: Indicate DPM method does I/O
Document that the addPersistentPreferredActivity method does Disk I/O
and so should not be called on the main thread.

Bug: 142648455
Test: m docs
Change-Id: Iadf2ab82f4f573e53ff68cad0b981494acf6f9b6
2019-10-18 12:24:43 +01:00
TreeHugger Robot
cf4c6d01af Merge "[wm]: System ui visibility policy for freeform windowing" 2019-10-18 10:51:10 +00:00
Adrian Roos
fbcd32e552 protolog: improve build time of frameworks/base/services
Improves build time by speeding up the protolog source transformation
tool:
- parallelize the transformation to use all available cores
- remove dependency on lexicographically preserving printer
- disable comment attribution and language level validation

Speeds up the build step from ~30s to ~4s.

Test: atest protologtool-tests
Test: make services.core.protologsrc && edit file in fw/base/services/core && time make services.core.protologsrc
Change-Id: I052e9eb3cc791edf60c555c6fcf59f2e59f0ba68
2019-10-18 12:34:28 +02:00
Alan Stokes
819fea292b Move more fields to InstallSource.
Move installerPackageName and isOrphaned into InstallSource. Remove
now-redundant uses of installerPackageName in various helper
classes. Make InstallSource non-null everywhere.

Bug: 134746019
Test: atest -p services/core/java/com/android/server/pm
Change-Id: If4583ede7a4d67425320a240f1c6874b4b267df3
2019-10-18 11:21:27 +01:00
Stanislav Zholnin
6de445e0f2 Merge "Add logging of one time permissions to PermissionGrantRequestResultReported atom." 2019-10-18 09:02:17 +00:00
Alan Stokes
9aa75e1049 Merge "Remove cookie parameter from updateFlags*." 2019-10-18 08:35:57 +00:00
Alan Stokes
74ade957a4 Merge "Store CRCs as Integer rather than as hex strings." 2019-10-18 08:35:29 +00:00
Gavin Corkery
8b79ee70e9 Merge "Use userId and package installer name when committing rollbacks" 2019-10-18 07:08:15 +00:00
Felipe Leme
75597f63df [automerger skipped] Merge "Dump isPrimaryUser() / isSplitSystemUser() on 'user' service." into qt-qpr1-dev am: bc06a47cd6
am: a61a261318 -s ours
am skip reason: change_id Ia9c50a2cd1de5ad8b0c9d5573b1760601fbcef76 with SHA1 d7b88384fe is in history

Change-Id: I7d3e056a4a10c4a4250108bbcce90d267d959b22
2019-10-17 23:57:34 -07:00
Felipe Leme
a61a261318 Merge "Dump isPrimaryUser() / isSplitSystemUser() on 'user' service." into qt-qpr1-dev
am: bc06a47cd6

Change-Id: I9b9c3711806d0f9c0f08438f23759388e8eb8efa
2019-10-17 23:50:37 -07:00
Felipe Leme
bc06a47cd6 Merge "Dump isPrimaryUser() / isSplitSystemUser() on 'user' service." into qt-qpr1-dev 2019-10-18 06:28:44 +00:00
Jimmy Chen
6e57d0032b Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb am: 58d08de0c6 am: e21e19ec4d
am: e8d6c6ac04

Change-Id: I069022ca21c0a09ac2eab1b97436223df99a3b1b
2019-10-17 23:25:44 -07:00
Jimmy Chen
e8d6c6ac04 Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb am: 58d08de0c6
am: e21e19ec4d

Change-Id: Ida50dff8604243871d3f93258ea75b45ae25877c
2019-10-17 23:19:13 -07:00
Jimmy Chen
e21e19ec4d Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb
am: 58d08de0c6

Change-Id: I618c950426976dd1899284d0c249ea7b4e45b479
2019-10-17 23:12:30 -07:00
Jimmy Chen
58d08de0c6 Merge "p2p: mirgrate p2p into tethering modes"
am: 8a9a9adaeb

Change-Id: Ib8f43d77a5f57965fa217e6e92eb9773e7914b54
2019-10-17 23:06:04 -07:00
Nate Jiang
31654058d3 Merge "[WifiManager] add public API to register callback on scan result" 2019-10-18 05:55:47 +00:00
Jimmy Chen
8a9a9adaeb Merge "p2p: mirgrate p2p into tethering modes" 2019-10-18 05:42:31 +00:00
Bill Yi
d7554f399f Import translations. DO NOT MERGE
Change-Id: Ie325a852dabdafb0a01527c911d4b16f011e3931
Auto-generated-cl: translation import
2019-10-17 22:36:12 -07:00
Roshan Pius
09de13ed90 Create a filegroup for utilities used by wifi
These non-formal API utilities will be compiled into the wifi stack
APK & jar-jar'ed to avoid conflicting with the utilities present
on the system image.

Bug: 142809066
Test: Compiles & wifi stack can connect to networks.
Change-Id: Ie02f9c34fdf953ab9a0c1525b22ce267af9bcbd5
2019-10-17 22:19:07 -07:00
Aaron Huang
8adf1652b9 Merge "Expose MacAddress methods to public API" am: 7b98130570 am: 0688f9b6b1 am: c55e2d6d59
am: 93cc10ac81

Change-Id: Ie117595096175ddb0affaa36d5f287a533e99eb5
2019-10-17 21:20:51 -07:00
Aaron Huang
93cc10ac81 Merge "Expose MacAddress methods to public API" am: 7b98130570 am: 0688f9b6b1
am: c55e2d6d59

Change-Id: I98471c410f483ad9d1ec1602c27bf4a21df305de
2019-10-17 21:14:08 -07:00
Aaron Huang
c55e2d6d59 Merge "Expose MacAddress methods to public API" am: 7b98130570
am: 0688f9b6b1

Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
2019-10-17 21:07:13 -07:00
Aaron Huang
0688f9b6b1 Merge "Expose MacAddress methods to public API"
am: 7b98130570

Change-Id: I98c2104fe5307e916bd2026eb943bfe4a9913d07
2019-10-17 20:55:36 -07:00
Aaron Huang
7b98130570 Merge "Expose MacAddress methods to public API" 2019-10-18 03:45:40 +00:00
TreeHugger Robot
6d04d658dc Merge "Code cleanup: StagedRollbackTest (3/n)" 2019-10-18 03:38:09 +00:00
Philip P. Moltmann
c9bb90c0e0 Merge "Add feature context" 2019-10-18 02:26:08 +00:00
JW Wang
3bcb811cf6 Code cleanup: StagedRollbackTest (3/n)
Rename and group device methods together that belong to the same host
side method.

Bug: 142697546
Test: atest StagedRollbackTest
Change-Id: Iec49c141ef2b6c99c3a395c5287af562ee975942
2019-10-18 09:37:16 +08:00
Android Build Merger (Role)
291a46e4f4 Merge "[automerger skipped] Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814 am: 5c31848594 am: ad2bc6a178 -s ours am skip reason: change_id I028c774fdea167924b064855267254c15f22fddb with SHA1 5ff1173ab1 is in history" 2019-10-18 01:13:53 +00:00
Marco Nelissen
4bab53bf97 [automerger skipped] Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814 am: 5c31848594
am: ad2bc6a178 -s ours
am skip reason: change_id I028c774fdea167924b064855267254c15f22fddb with SHA1 5ff1173ab1 is in history

Change-Id: I95df5fe79b4a144f55ed86734e4ed06eb8ea4ec8
2019-10-17 18:12:46 -07:00
TreeHugger Robot
c0581181c8 Merge "Ensure #openTypedAssetFileDescriptor doesn't lose extras." 2019-10-18 01:11:23 +00:00
Louis Chang
95a5e431d2 Merge "Add public API for converting activity translucency" 2019-10-18 01:07:50 +00:00
Marco Nelissen
ad2bc6a178 Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814
am: 5c31848594

Change-Id: I64f4e37eeb88f3c15afed1b1afa541c2fe265722
2019-10-17 18:06:18 -07:00
Marco Nelissen
5c31848594 Merge "Move JetPlayer implemention and JNI" am: 147d162e10
am: 256948b814

Change-Id: I371fb89a6ccb2cfeb20be78c83f644adc0f8f6cc
2019-10-17 17:55:14 -07:00
Marco Nelissen
256948b814 Merge "Move JetPlayer implemention and JNI"
am: 147d162e10

Change-Id: I5263cac58608b082bc8b47e99838b62fe88786e5
2019-10-17 17:48:33 -07:00
TreeHugger Robot
9d95d01d37 Merge "Revert "Sync app ops for all runtime permissions in PermissionPolicyService."" 2019-10-18 00:32:37 +00:00
Marco Nelissen
147d162e10 Merge "Move JetPlayer implemention and JNI" 2019-10-18 00:28:31 +00:00