Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458,103 Commits 3 Branches 0 Tags
dc15bb4e3d69e1f42f4e9ca6a66fe026cdc13338
Commit Graph

458103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nandana Dutt
dc15bb4e3d Allow R targeting apps a legacy view 
Allow R targeting apps to have a legacy view when accessing sdcard via
raw file paths temporarily.

This will let us bring back a986bc6420

This will also let apps that target R and keep
the legacy flag to use raw paths continue to work until we enable FUSE

BUG: 137755945
BUG: 131432978
Test: atest CtsDeqpTestCases
Test: atest RestrictedPermissionsTest
Test: atest RestrictedStoragePermissionSharedUidTest
Change-Id: I0d49eca9d4e1769dcd3c0e2338db5b5e5a473032
 2020-01-06 10:07:16 +00:00
Automerger Merge Worker
3522d98589 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: edb04b0849 am: 5727033c3a am: 3a18f484a1 
Change-Id: I54b4c3268878a10583dc6a4cf07f07588f0ca6cf
 2020-01-03 16:31:22 +00:00
Automerger Merge Worker
3a18f484a1 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: edb04b0849 am: 5727033c3a 
Change-Id: I77d243d82c34a976637f6bdb8f652e9886c3b491
 2020-01-03 16:22:21 +00:00
Daulet Zhanguzin
5727033c3a Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 
am: edb04b0849

Change-Id: I8e4b29e00a958c9de57379010b81f416c8bfa046
 2020-01-03 08:03:33 -08:00
TreeHugger Robot
57a1e4c4aa Merge "Revert submission 9996524-restrict_legacy_appop" 2020-01-03 16:03:23 +00:00
TreeHugger Robot
1ee3dda02d Merge "Explicit null-check before use in FileIntegrityService" 2020-01-03 15:58:44 +00:00
Treehugger Robot
edb04b0849 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2020-01-03 15:44:41 +00:00
TreeHugger Robot
6a723fb7c2 Merge "Move media/apex to apex/media" 2020-01-03 15:30:26 +00:00
Daulet Zhanguzin
8d0b7f106f Replace com.android.internal.util.Preconditions.checkNotNull with 
java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: I978d5d0959f7800e859bfb384458ba52adc0c2b0
 2020-01-03 14:42:32 +00:00
Kholoud Mohamed
ebd5b2447e Revert submission 9996524-restrict_legacy_appop 
Reason for revert: Potential culprit for Bug 147134548 - verifying through Forrest before revert submission
Reverted Changes:
I63a26fd59: Verify scoped storage policy for R
I86dfaec89: Prevent apps that target >= R from opting out of s...

Change-Id: I9d27fa97fb939dc52855f9f09c37f9b3632a9222
 2020-01-03 14:23:59 +00:00
JW Wang
d02b11f663 Merge changes Id7ba8465,I769e7261,Ib1fac7e0 
* changes:
  Simplify a logging message (3/n)
  Use PackageRollbackInfo#getVersionRolledBackFrom to simplify code (2/n)
  Implement VersionedPackage#equals (1/n)
 2020-01-03 14:18:03 +00:00
Fabian Kozynski
19135aed46 Merge "Fix name of TemperatureControlTemplate" 2020-01-03 14:14:43 +00:00
Sungsoo Lim
420c2fc155 Move media/apex to apex/media 
And fix some lint warnings.

Test: build & boot
Change-Id: Ib59aa788b02e5bf77dd1355766adbb57860cf737
 2020-01-03 23:10:32 +09:00
TreeHugger Robot
c07ad2d6d5 Merge "Improve ResolverActivity UX on TV" 2020-01-03 13:49:35 +00:00
Nadav Bar
773a758d22 Merge "Make AudioRecordingConfiguraton#getClientUid a SystemAPI" 2020-01-03 11:03:51 +00:00
TreeHugger Robot
314413652a Merge "Rename log_from_module to module" 2020-01-03 10:47:32 +00:00
Nandana Dutt
6aefe5f556 Merge "Prevent apps that target >= R from opting out of scoped storage" 2020-01-03 08:54:42 +00:00
Nandana Dutt
a986bc6420 Prevent apps that target >= R from opting out of scoped storage 
BUG: 137755945
BUG: 131432978
Test: atest RestrictedPermissionsTest
Test: atest RestrictedStoragePermissionSharedUidTest
Change-Id: I86dfaec8916754fcf9b199c553c32c84cefcad9a
 2020-01-03 08:54:26 +00:00
TreeHugger Robot
3607553d05 Merge "Correct Preconditions.checkNotNull usage." 2020-01-03 08:54:25 +00:00
Automerger Merge Worker
08c2f021de Merge "Use ro.product.vndk.version for unbundled product apks" am: cbfcd44f68 am: e0e165f06e am: bbce9e0c5a 
Change-Id: I781e0f1f9e70e584b986d5b2c7e7e87804c52157
 2020-01-03 07:51:13 +00:00
Automerger Merge Worker
bbce9e0c5a Merge "Use ro.product.vndk.version for unbundled product apks" am: cbfcd44f68 am: e0e165f06e 
Change-Id: I6507b31c3a1b36830a231064e560d978b9427f5c
 2020-01-03 07:36:52 +00:00
Justin Yun
e0e165f06e Merge "Use ro.product.vndk.version for unbundled product apks" 
am: cbfcd44f68

Change-Id: I49b3841f627a6e8b25e91e02dce491cb526886d9
 2020-01-02 23:18:04 -08:00
Treehugger Robot
cbfcd44f68 Merge "Use ro.product.vndk.version for unbundled product apks" 2020-01-03 07:10:01 +00:00
TreeHugger Robot
2d34c84fb7 Merge "MediaRouter: Enable MRM.selectRoute()" 2020-01-03 06:36:14 +00:00
JW Wang
41c017e09c Simplify a logging message (3/n) 
VersionedPackage overrides toString() which can be used in string
concatenation.

Bug: 147028082
Test: build doesn't fail
Change-Id: Id7ba8465c8e5df6e7c409e5b0c14e99eb31bbcef
 2020-01-03 14:31:39 +08:00
JW Wang
b059e2f6d0 Use PackageRollbackInfo#getVersionRolledBackFrom to simplify code (2/n) 
PackageRollbackInfo#getVersionRolledBackFrom returns a VersionedPackage
which contains a version code. No need to query the version code from
the package manager.

Bug: 147028082
Test: atest StagedRollbackTest
Change-Id: I769e726183ee99bb9e8c7576bb8b6c21a75fe2ff
 2020-01-03 14:31:39 +08:00
JW Wang
8108251a87 Implement VersionedPackage#equals (1/n) 
So we don't need to call VersionedPackage#getPackageName and
VersionedPackage#getVersionCode to compare 2 VersionedPackages.

Note you must also override #hashCode whenever you override #equals.

Bug: 147028082
Test: atest StagedRollbackTest
Change-Id: Ib1fac7e0521e2ccde0c2bb1f3fd28c0a7cd70234
 2020-01-03 14:30:04 +08:00
Kyunglyul Hyun
138246e495 MediaRouter: Enable MRM.selectRoute() 
MediaRouter2 won't ignore session created by others.
(proviers or MediaRouterManager)

testRouterOnSessionCreated is also enabled.

Test: atest mediaroutertest

Change-Id: Ibeac3ae6b725c93c80f5a308d250574cdd21c9be
 2020-01-03 13:33:18 +09:00
Automerger Merge Worker
aaba395dd5 [automerger skipped] Merge "Moved RilRadioTechnology annotation" am: d031947100 am: 11caff98ff am: 59ddb32fde -s ours 
am skip reason: Change-Id I2411052465204d87cb5982102df0fd1af012a97c with SHA-1 d75d5344f4 is in history

Change-Id: I3164f65d472b1b5a38b156b78fa7ff7fb303a313
 2020-01-03 03:40:40 +00:00
Automerger Merge Worker
59ddb32fde Merge "Moved RilRadioTechnology annotation" am: d031947100 am: 11caff98ff 
Change-Id: I0cf1626bd1588a48f092fc7d2ae717251a7f4240
 2020-01-03 03:22:10 +00:00
Daniel Bright
11caff98ff Merge "Moved RilRadioTechnology annotation" 
am: d031947100

Change-Id: I2d52c03374a8395dc9fb5fefc6eaeb863162f342
 2020-01-02 19:06:40 -08:00
Menghan Li
8c4eed8a3d Merge "Remove unused symbols in framework/base" 2020-01-03 03:03:12 +00:00
David Su
4003e43525 Merge "Revert "ConnectivityManagerTest: grant access to Wifi @hide APIs"" 2020-01-03 02:33:45 +00:00
David Su
0e5b5f8d76 Merge changes from topics "framework-wifi-test-defaults", "frameworkwifiapitests-mk-to-bp" 
* changes:
  Revert "Convert FrameworksWifiApiTests mk to bp"
  Revert "FrameworksWifiApiTests: build against framework-wifi"
 2020-01-03 02:33:30 +00:00
David Su
8b055fdc1c Revert "Convert FrameworksWifiApiTests mk to bp" 
This reverts commit 5eac974c59.

Reason for revert: Broke build

Change-Id: I82e58c215fa7c6f3162fe76a82002e251a7fe68c
 2020-01-03 02:24:04 +00:00
David Su
6129ff5a6b Revert "FrameworksWifiApiTests: build against framework-wifi" 
This reverts commit ff7b3326cd.

Reason for revert: Broke build

Change-Id: I0b1daaf443fce341c66a6ca12d89b8691538ed30
 2020-01-03 02:22:40 +00:00
Joanne Chung
e42231be01 Merge "Fix onConnet() is called twice for AugmentedAutofillService." 2020-01-03 02:14:22 +00:00
Treehugger Robot
d031947100 Merge "Moved RilRadioTechnology annotation" 2020-01-03 02:10:39 +00:00
David Su
a676b9934c Revert "ConnectivityManagerTest: grant access to Wifi @hide APIs" 
This reverts commit 434fe602b8.

Reason for revert: Broke build

Change-Id: I15d6fbf06902987e0517f4c72cbf440b7b570a60
 2020-01-02 18:09:48 -08:00
TreeHugger Robot
3de59f5715 Merge "Removed LTE_CA from Annotations" 2020-01-03 01:57:40 +00:00
Muhammad Qureshi
d40b62f4cd Merge "Add --supportQ flag to java StatsLog codegen" 2020-01-03 01:46:03 +00:00
Automerger Merge Worker
c25a9dd796 Merge "Prevent double-counting of kernel stack size in dumpsys reports" am: 9493f0ed0b am: a457a78ab7 am: 6dfd9358a3 
Change-Id: Ic4ed5159c6e823167bc867e29d15dc526a3c33ea
 2020-01-03 01:34:01 +00:00
menghanli
414327b7b9 Remove unused symbols in framework/base 
Bug: 147099702
Test: local test
Change-Id: If2aa278afe8bde27ecb200e086316df1893df583
 2020-01-03 09:29:56 +08:00
Automerger Merge Worker
6dfd9358a3 Merge "Prevent double-counting of kernel stack size in dumpsys reports" am: 9493f0ed0b am: a457a78ab7 
Change-Id: I5454c8a0c92bd8b25956cf96b987199fffe3a898
 2020-01-03 01:15:50 +00:00
Suren Baghdasaryan
a457a78ab7 Merge "Prevent double-counting of kernel stack size in dumpsys reports" 
am: 9493f0ed0b

Change-Id: If643779ba45321f1dcb5b772ade4de451fcd4e1a
 2020-01-02 17:01:53 -08:00
JW Wang
3cdf7d9a57 Merge "Respect the rollback data policy (3/n)" 2020-01-03 00:55:06 +00:00
David Su
1029e50022 Merge changes from topics "framework-wifi-test-defaults", "frameworkwifiapitests-mk-to-bp", "wifitrackerlibtests-access-hidden-apis" 
* changes:
  Formalize WifiConfiguration#getIpConfiguration()
  WifiTrackerLibTests: grant access to Wifi @hide APIs
  ConnectivityManagerTest: grant access to Wifi @hide APIs
  FrameworksWifiApiTests: build against framework-wifi
  framework-wifi: default build rule for tests
  Convert FrameworksWifiApiTests mk to bp
 2020-01-03 00:52:37 +00:00
Daniel Bright
809d36111f Removed LTE_CA from Annotations 
Teams need to directly link to Annotations and having
a @hide as a const prevents that @SystemApi methods from
doing this.

Bug: 146084549
Test: FrameworkServiceTests
Change-Id: I2d6ad7621560ef73b10d6eb861c44700b27a2ea6
 2020-01-02 16:51:00 -08:00
Automerger Merge Worker
27baafad7d [automerger skipped] Merge "Fix Error Prone errors" am: 645ae56f43 am: 90d6707b02 am: 71d5f85ea3 -s ours 
am skip reason: Change-Id I829373d41c97962fe2122ea74cef12ba342ac33c with SHA-1 5ea7fb7f89 is in history

Change-Id: I35c8c2785caddeab10e221ae84a3109a59750743
 2020-01-03 00:35:33 +00:00
TreeHugger Robot
e4981525f2 Merge "Remove dependency on libutils in native autogen" 2020-01-03 00:26:51 +00:00