Commit Graph

27983 Commits

Author SHA1 Message Date
Jeff Sharkey
da02aceac0 Merge "Split "generation" into added and modified." 2020-01-15 05:35:16 +00:00
Kyunglyul Hyun
77b46edc46 Merge "MediaSession: Add volumeControlId in MediaCotnroller.PlaybackInfo" 2020-01-15 05:27:27 +00:00
Mark Chien
9eb533470d Merge "Unhide NetworkRequest API which use legacy type" 2020-01-15 04:29:15 +00:00
Remi NGUYEN VAN
b7c80b5557 Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-15 04:14:32 +00:00
Automerger Merge Worker
d3cb54c8d9 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 am: f01f6aec2f
Change-Id: I93ebc67677fc326871ba151a4b6bae0bc60e197d
2020-01-15 03:36:50 +00:00
Wu Ahan
d5b8f0590d Merge "Make some apis @TestApi and @hide for usage in tests" 2020-01-15 03:33:41 +00:00
Automerger Merge Worker
f01f6aec2f Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23
Change-Id: If317967b103c8b797a74b089c13b518c33b60465
2020-01-15 03:24:56 +00:00
Paul Hu
cb8f129c89 Merge "Expose SocketKeepalive#SUCCESS as SystemApi" 2020-01-15 02:44:32 +00:00
Allen Su
b498fbf860 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" 2020-01-15 02:42:27 +00:00
Jeff Sharkey
37a9363a70 Split "generation" into added and modified.
The reason we created the "generation" concept was as a replacement
for DATE_ADDED and DATE_MODIFIED, and we realized there is a use-case
for having both values, so this change splits our previous work into
GENERATION_ADDED and GENERATION_MODIFIED to match the other names.

Bug: 147666253, 140248585, 142698119
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I09cc3f52946e91fa3e9aaa14b9fd6309f32712c4
2020-01-14 18:24:33 -07:00
Bonian Chen
4c1b1ff615 Merge "[Settings] Expose @hide APIs as @SystemApi" 2020-01-15 01:04:01 +00:00
Curtis Belmonte
e0e5852108 Merge "Add auth type to BiometricPrompt.AuthenticationResult" 2020-01-15 00:44:26 +00:00
Automerger Merge Worker
2ba0fb04a4 Merge changes from topic "remove_dev_mode" am: 8027ca9b97 am: b321ddb2f2
Change-Id: I8fe01cc3b1a669fb4e7516f37471dc8fe5493cde
2020-01-14 23:58:13 +00:00
Automerger Merge Worker
7d30df799e support data migration from OEM legacy app to mainline am: 32f525c975 am: 383e36c9aa
Change-Id: I9b1dc1e313b1035af00c0b066bbc06274569caf4
2020-01-14 23:58:06 +00:00
Chen Xu
383e36c9aa support data migration from OEM legacy app to mainline
am: 32f525c975

Change-Id: Icbc338382683711d72a46f153a8385a6df1ac9a2
2020-01-14 15:07:33 -08:00
Jack Yu
8027ca9b97 Merge changes from topic "remove_dev_mode"
* changes:
  Do not migrate use full volume shared preference
  support data migration from OEM legacy app to mainline
2020-01-14 22:59:31 +00:00
Jack Yu
c3133cbc57 Do not migrate use full volume shared preference
Use full volume has been renamed to override DnD and
the toggle is now only available for certain countries. We
intended not to provide the ability to migrate this shared
preference as it might cause issue for users who already
changed the preference. After mainline migration, override
DnD should be always reset to default value of that country.

Test: Manual
Bug: 147426188

Merged-In: I5746fe32674131b474e784bd5dd62ecff76386d5
Change-Id: I5746fe32674131b474e784bd5dd62ecff76386d5
(cherry picked from commit bcbe46816c)
2020-01-14 22:59:05 +00:00
Chen Xu
32f525c975 support data migration from OEM legacy app to mainline
Defined systemAPI for interaction with legacy cellbroadcast app

Bug: 135956699
Test: Tested with cell broadcast receiver test app and confirmed data can be migrated.
Merged-In: I6e583672a3673fd226e14d33d7a7648f4fd03efb
Change-Id: I6e583672a3673fd226e14d33d7a7648f4fd03efb
(cherry picked from commit ad2f91fc6d)
2020-01-14 22:54:58 +00:00
Sarah Chin
febf744282 Merge "Remove @hide for CarrierConfigManager constants" 2020-01-14 22:52:11 +00:00
Shuo Qian
8b4325f86c Merge "Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline" 2020-01-14 21:29:08 +00:00
Daniel Bright
f16dc0708a Merge "Rewriting phone constants for mainline" 2020-01-14 21:14:35 +00:00
Curtis Belmonte
6601bc3403 Add auth type to BiometricPrompt.AuthenticationResult
Now that BiometricPrompt supports primary auth via device credential,
we want the high-level type of authentication used to be available to a
developer via the AuthenticationResult in onAuthenticationSucceeded.
Rather than include information about the strength of the biometric
sensor by reusing the existing Authenticators.Types constants, this
commit adds new integer constants that provide similar information but
at a lower level of granularity (device credential vs. biometric).

Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics
Test: Manually inspect new AuthenticationResult object on Pixel 3/4

Bug: 80525177
Bug: 141025588

Change-Id: Ic09ffdff995afe374f11721e6e777632de9ae867
2020-01-14 12:33:19 -08:00
David Su
684c9a2e63 Merge changes from topic "networkscoremanager-cachefilter"
* changes:
  SettingsLib: Rename CACHE_FILTER_* to SCORE_FILTER_*
  NetworkScoreManager: Expose SCORE_FILTER_* consts
2020-01-14 18:20:41 +00:00
Automerger Merge Worker
f30c746b69 Merge "Add new @SystemApis for RCS dependencies" am: 6408fa473f am: dd840cdaae
Change-Id: I307990e1b794a659b5110406794ba927d223be86
2020-01-14 18:17:11 +00:00
David Su
025eab036f Merge changes from topics "frameworkswifiapitests-jacoco", "settingsunittests-wifi-systemapi", "sl4a-access-wifi-hidden-apis"
* changes:
  Remove FrameworksWifiApiTests jacoco exclude_filter
  FrameworksWifiApiTests: build against framework-wifi (Attempt 2)
  Convert FrameworksWifiApiTests mk to bp (Attempt 2)
  Give SL4A access to @hide Wifi APIs
  Expose WifiInfo & NetworkSelectionStatus Builders for SettingsUnitTests
  Expose WifiEnterpriseConfig.getClientPrivateKey() for WifiConfigurationProviderTest
  Expose ScanResult constructor for SettingsLibRoboTests
  SettingsLibTests: grant access to Wifi @hide APIs
  TetheringTests: Stop using @hide Wifi P2P APIs
2020-01-14 18:06:27 +00:00
Brad Ebinger
6408fa473f Merge "Add new @SystemApis for RCS dependencies" 2020-01-14 17:31:36 +00:00
Jeff Sharkey
2ffabf3081 Merge "Introduce "generation" to track mutations." 2020-01-14 16:22:57 +00:00
Neil Fuller
872d3504ec Merge "Expose time / time zone system apis for telephony" 2020-01-14 15:56:15 +00:00
Automerger Merge Worker
331edc9a1b Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59 am: b256f4d348
Change-Id: Idd26f3118e879ab05a8cdd23a9e4999b3bafbf47
2020-01-14 15:32:07 +00:00
Automerger Merge Worker
b256f4d348 Merge "Make NattKeepalivePacketData @SystemApi" am: 3516f5853a am: 7522764e59
Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
2020-01-14 15:18:43 +00:00
Aaron Huang
3516f5853a Merge "Make NattKeepalivePacketData @SystemApi" 2020-01-14 14:36:09 +00:00
paulhu
bd47e8cde8 Expose SocketKeepalive#SUCCESS as SystemApi
Support wifi mainline module usage.

Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
      atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-14 21:42:56 +08:00
Remi NGUYEN VAN
f863b80c70 Add NetworkRequest#satisfiedBy to SystemApi
The API is useful for NetworkFactories to select requests based on
capabilities.
This mirrors NetworkCapabilities#satisfiedByNetworkCapabilities

Test: m
Bug: 138306002
Change-Id: I1d4a928256951397cabde5c352a872fd48d85859
2020-01-14 21:45:38 +09:00
Kyunglyul Hyun
bef875cd04 MediaSession: Add volumeControlId in MediaCotnroller.PlaybackInfo
This CL adds API to get/set volume control ID for a session.

Volume control ID is set by volume providers (e.g. MediaRouter)
to notify which volume provider is used by the session
to other apps such as System UI, Settings.

Bug: 147528363
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest

Change-Id: I9ecafeca8b5090b4c8a89029d1e6411fd48919cb
2020-01-14 20:37:08 +09:00
Sarah Chin
a912e113f8 Remove @hide for CarrierConfigManager constants
Remove @hide for CarrierConfigManager constants used outside of
Telephony mainline

referencing packages:
cts/tests
frameworks/base/packages/CarrierDefaultApp
frameworks/base/packages/SystemUI
frameworks/base/packages/Tethering
frameworks/base/services
frameworks/base/telecomm
frameworks/opt/wifi
packages/apps/Dialer
packages/apps/Settings
packages/providers/BlockedNumberProvider
packages/services/Car
packages/services/Telecomm
prebuilts/sdk

Test: build
Bug: 147447171
Change-Id: Ib3d8d904a80f11247012b01aceb92eaee2c84d5b
2020-01-13 23:10:59 -08:00
Automerger Merge Worker
07cf194254 Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" am: 9f48bdc383 am: ee1e3f4969
Change-Id: I5a749fab6007fe4f17f6e9752eb0b9a35b9c0ea0
2020-01-14 06:41:23 +00:00
allenwtsu
f7ce51f9cf [RCS] Implement notifyRcsAutoConfigurationReceived()
Bug: 147122370
Test: build pass
Change-Id: I239c53806b148e899d8078c469731f05e8b97885
2020-01-14 14:30:01 +08:00
Automerger Merge Worker
ee209e1194 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b16 am: 28220533d8 am: 8669be6a1b
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
2020-01-14 06:27:10 +00:00
Betty Chang
9f48bdc383 Merge "[Telephony Mainline] Add new SystemApi method and SystemApi annotation for mainline" 2020-01-14 06:19:49 +00:00
Automerger Merge Worker
8669be6a1b Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b16 am: 28220533d8
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
03c1364b16 Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" 2020-01-14 05:30:14 +00:00
Lorenzo Colitti
cae0b367e0 Merge "Add a Builder to NetworkAgentConfig, and make it SystemApi." 2020-01-14 05:01:06 +00:00
markchien
ace1d3446f Unhide NetworkRequest API which use legacy type
Bug: 144753389
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 12:54:40 +08:00
Jeff Sharkey
bf8b367dd6 Introduce "generation" to track mutations.
Add generation numbers to the metadata for each media item. This is
useful for apps that are attempting to quickly identify exactly
which media items have changed since a previous point in
time. Generation numbers are monotonically increasing over time, and
can be safely arithmetically compared.

Detecting media changes using generation numbers is more robust than
using DATE_MODIFIED, since those values may change in unexpected
ways when apps use File.setLastModified() or when the system clock
is set incorrectly.

This is implemented by ensuring that all mutations to go through
our local SQLiteQueryBuilder, which then forces those mutations to
always happen inside an active transaction.  Then each time we
create a transaction, we increment the generation counter, and
force-copy the current generation into any mutation operations.

This design also means that all mutations that should affect the
generation counter must go through DatabaseHelper to ensure that
the logic above is applied; there's mechanical refactoring across
MediaProvider to accomplish this.

Fix bug in getWritableDatabase() that could return a readable
database.  Fix bug in LegacyMediaProvider to create missing
directories.  Adjust logging script to enable log cleaner SQL from
SQLQueryBuilder instead of noisy raw logs.

Bug: 140248585
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: If87f586e2340688ea1716682de20ee40c0d2b953
2020-01-13 21:39:18 -07:00
Automerger Merge Worker
995211c840 Merge "Add NETWORK_STACK_SERVICE to SystemServiceRegistry" am: 55962277bf am: c5dfc3ca1b
Change-Id: I230c75de4f9f9f79b3583aace860957c83b0586d
2020-01-14 04:36:00 +00:00
zoey chen
55957fccfb [Settings] Expose @hide APIs as @SystemApi
Add new SystemApi methods for Cdma preference controller

Bug: 145788881
Test: make
Change-Id: I04803885d2367f0b79471aaab66b7a0e8e6a912d
2020-01-14 12:04:16 +08:00
Betty Chang
2cb542fd20 Merge "[Mainline] Add get and set premium sms consent method and make as @SystemApi" 2020-01-14 03:51:34 +00:00
TreeHugger Robot
9b10a80412 Merge "Flag to bypass shortcut req for "convo" notifs" 2020-01-14 03:50:40 +00:00
TreeHugger Robot
63b67c0efa Merge "Add the ime package name to the inline suggestions request" 2020-01-14 03:38:00 +00:00
TreeHugger Robot
1dad0a01ae Merge "Unhide FilterConfiguration part 1" 2020-01-14 03:14:29 +00:00