Commit Graph

4378 Commits

Author SHA1 Message Date
Android Build Merger (Role)
50e06f25ac [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665
Change-Id: I0cd990dcdfb899fa419cf1b28934d4118c225937
2018-10-05 00:19:37 +00:00
Android Build Merger (Role)
ae30765665 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac
Change-Id: Id59316f6628fcabc71962bd9ca8ab15cbbfb8b6d
2018-10-05 00:19:27 +00:00
Android Build Merger (Role)
6ef77aedac [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c
Change-Id: I5f8b88ca54c22bb978fc6c468259fec9e0e9898a
2018-10-05 00:19:19 +00:00
Android Build Merger (Role)
010585fe3c [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd
Change-Id: I80ac911a166e12eedf77518436808d4f3ede872c
2018-10-05 00:19:12 +00:00
Jeff Sharkey
301d17e4dd RESTRICT AUTOMERGE: Recover shady content:// paths.
The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.

This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths.  Consider this example:

    <path-permission android:pathPrefix="/private" ... />

    uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);

    content://com.example//private

The Uri above will pass the security check, since it's not
technically a prefix match.  But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.

Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.

Bug: 112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a
2018-10-05 00:19:08 +00:00
Android Build Merger (Role)
6be1d6713f [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a am: 46f4563313
Change-Id: I49cbda7a4d9643808cc9c164970a6ee630b2233c
2018-05-22 21:59:39 +00:00
Android Build Merger (Role)
46f4563313 [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008 am: 77f449068a
Change-Id: I0f74a4a39349e7c45f1468776618e360be87090c
2018-05-22 21:59:34 +00:00
Android Build Merger (Role)
77f449068a [automerger] Make safe label more safe am: 2263da9539 am: 05086b1008
Change-Id: Ibf0d6da3ef712a2cc45587d59880ddce03a34447
2018-05-22 21:59:30 +00:00
Android Build Merger (Role)
05086b1008 [automerger] Make safe label more safe am: 2263da9539
Change-Id: If833354e5ae2b056de124fe23f0414c7654f6c33
2018-05-22 21:59:24 +00:00
Todd Kennedy
2263da9539 Make safe label more safe
* limit the absolute maximum size of the label to 50000 characters
[which is probably far more than necessary, but, can be dialed down]

* use a string buffer while processing the string [instead of creating
multiple string objects]

Bug: 62537081
Test: Manual. Install APK in bug and see that it can be uninstalled
Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Merged-In: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
2018-05-22 21:59:22 +00:00
Philip P. Moltmann
d043a840f7 Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev 2017-02-14 16:03:32 +00:00
Philip P. Moltmann
755d78dbd9 [DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"
This reverts commit 2fc44947dd.

Bug: 30662828
Change-Id: Ia22343c19e155555dff3b0cb58f7b58df0ce6301
2017-02-13 23:44:31 +00:00
Shreyas Basarge
e33c3c81af Fix requiresCharging false value ignored issue
If a SyncRequest builder is used to create a sync
request and setRequiresCharging(bool) is used,
the sync request requires charging irrespective of
the boolean value provided. This cl fixes the issue.

Bug: 35027396

Test: Tested manually by looking for the charging bit in jobscheduler
dumpsys.

Change-Id: I8f642597a64b8964665f41f5ce9ca71529634069
(cherry picked from commit 3a147230a4)
2017-02-06 20:11:42 +00:00
Philip P. Moltmann
2fc44947dd [DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms
... so that multiple applies can be combined into a single write.

Do do this I replaces the executor in the QueuedWork by a more Android-y
handler.

Test: Ran shared preferences CTS tests. Looked at log and saw a lot of
      skipped writes

Bug: 33385963
Bug: 30662828

Change-Id: I8f33df717be7091532930ccf6ca8c48940e4edd4
(cherry picked from commit 3349644872)
2017-01-31 02:50:24 +00:00
Paul Navin
90e9bbc814 Add hidden API for whether permission review mode is on.
am: 7b89a7b1f7

Change-Id: Ic7f4d30bd689bf5677600552030a3e696b16dfbb
2017-01-27 16:54:58 +00:00
Paul Navin
7b89a7b1f7 Add hidden API for whether permission review mode is on.
BUG: 34240393
Change-Id: I68e55767a7da1d457a6cedd210aac9e339fb996c
2017-01-27 03:42:32 +00:00
Elliot Waite
de2557f369 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c
2017-01-26 04:39:53 +00:00
Elliot Waite
54de77470d Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
Mark Lu
a8107e1074 docs: remove implicit intent from bindService and startService am: 94ebbe0e58
am: d7c29565ba

Change-Id: I44109d60ff26725daf6ebbce50bac9a7068146fe
2016-12-19 20:27:52 +00:00
Mark Lu
94ebbe0e58 docs: remove implicit intent from bindService and startService
bug: 18295867
Change-Id: Ib4b561dd215f4b124ce9a90b446bc03676f7e00a
2016-12-17 07:23:45 +00:00
Mark Lu
1c5a117342 docs: changes to broadcast documentation am: 33ec106d22
am: 377dab8ab3

Change-Id: I7dcb1bc57fb62f2b177c7ad15a9236da98fb749f
2016-12-16 05:06:37 +00:00
Michal Karpinski
d9eb4fce7d Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev
* changes:
  DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
  DO NOT MERGE Fix Lint errors for network logging API
  DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
  DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
  DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
  DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
  DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
  DO NOT MERGE [DPM] Management and retrieval of network logs
  DO NOT MERGE [DPM] DO can start network logging and listen for events
2016-12-14 10:44:23 +00:00
Mark Lu
33ec106d22 docs: changes to broadcast documentation
- move BroadcastReceiver info to developer guide. see cl/140402421
- add usage note to CONNECTIVITY_ACTION broadcast

bug:32533262
bug:33106411

Change-Id: Ic2aa517831d29418e0c42aa6fc1e7f9aeb50f802
2016-12-13 18:28:32 -08:00
Ruben Brunk
f755dfb89e Merge "Prevent crash on uninstall." into nyc-mr2-dev 2016-12-14 00:24:41 +00:00
Michal Karpinski
4c47adef60 DO NOT MERGE [DPM] Management and retrieval of network logs
This CL follows up on ag/1530343 and adds:
1) Various network events.
2) Retrieval method in DPM and APIs in DeviceAdminReceiver.
3) Extension of NetworkLogger and it's NetworkLoggingHandler.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Bug: 29748723
Change-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2
2016-12-13 17:19:22 +00:00
Ruben Brunk
12ab5e1d70 Prevent crash on uninstall.
- Crash due to race between package removal and permission revocation.
- Catch exception thrown by packagemanager.
- Improve documentation of packagemanager methods.

Bug: 32247014
Change-Id: Ie548c385e9e86418e7c4b87c571beebfcaeff353
2016-11-10 16:08:36 -08:00
Makoto Onuki
104f805337 App Shortcut: Clarify which attributes must be resources
Test: javadoc only -- m -j32 offline-sdk-docs

Bug 32495737

Change-Id: I4c3884172761b128d07f1c2948ab7ccc53951a7e
2016-10-31 11:31:45 -07:00
Kevin Hufnagle
68d699d100 docs: Updated ShortcutManager and ShortcutInfo class references.
Bug: 32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a
2016-10-18 15:53:09 -07:00
Dianne Hackborn
851ec49de7 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
2016-10-12 18:17:58 -07:00
Chet Haase
c158431f8e Fix small typo in ShortcutManager header docs
Bug: 32093275 fix typo in ShortcutManager javadocs
Test: no test, just words in the header docs
Change-Id: Icd33481a7f285686429d908cf92de0f6f886f962
2016-10-11 21:48:55 +00:00
Kevin Hufnagle
e83639f66a docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a
am: 2e8026acc0

Change-Id: I93a1abe6b80a441f8c441390dacbff2824d52e57
2016-09-27 00:02:44 +00:00
Kevin Hufnagle
abfc0340d7 docs: Removed all instances of "i.e." in IntentFilter parameter descriptions. am: e20b3d78e3
am: 9402b319fe

Change-Id: Id7d4b705073802abcb2d902b50673a09933ff3da
2016-09-27 00:01:00 +00:00
Kevin Hufnagle
2e8026acc0 docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB.
am: e9681e192a

Change-Id: Ide8f3c2dd5414737c798c20c1fe9f11dcd9640ce
2016-09-26 23:36:25 +00:00
Kevin Hufnagle
9402b319fe docs: Removed all instances of "i.e." in IntentFilter parameter descriptions.
am: e20b3d78e3

Change-Id: I8d677ebcf03c28f46874514408240162cd6331c5
2016-09-26 23:34:58 +00:00
Kevin Hufnagle
ee3fc61cf9 docs: Fixed example of ACTION_VIEW intent am: aedfd75b1b
am: 2c885fc5ea

Change-Id: I1d94ee6938726736d6cbccafea848dd6f3d6a350
2016-09-26 23:16:02 +00:00
Kevin Hufnagle
2c885fc5ea docs: Fixed example of ACTION_VIEW intent
am: aedfd75b1b

Change-Id: Iaaaa1cb0f6d796ad5c5c178c70850fd83e635013
2016-09-26 23:00:51 +00:00
Kevin Hufnagle
bec2e99f95 docs: Adjusted return value desc. for getApplicationEnabledSetting am: 5add769f59
am: d23fc43965

Change-Id: I27847f0935c047e74ab986c501fce160679a80d7
2016-09-26 23:00:16 +00:00
Kevin Hufnagle
996274a611 Merge "docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB." into nyc-dev 2016-09-26 22:55:00 +00:00
Kevin Hufnagle
4738231a55 Merge "docs: Removed all instances of "i.e." in IntentFilter parameter descriptions." into nyc-dev 2016-09-26 22:54:28 +00:00
Kevin Hufnagle
d23fc43965 docs: Adjusted return value desc. for getApplicationEnabledSetting
am: 5add769f59

Change-Id: Ic0566aa6e2764a9d0db58c6f66ad028229a8fdca
2016-09-26 22:52:54 +00:00
Kevin Hufnagle
adca055df1 Merge "docs: Fixed example of ACTION_VIEW intent" into nyc-dev 2016-09-26 22:40:15 +00:00
Kevin Hufnagle
e9681e192a docs: Added note in getCacheDir() that developers can use directory
obtained from getExternalCacheDir() to store app caches larger than
1 MB.

Bug: 22505268
Change-Id: I9972ba5ef7b43a135c00ac48a2e5ccb1fcc5b103
2016-09-23 16:44:03 -07:00
Kevin Hufnagle
e20b3d78e3 docs: Removed all instances of "i.e." in IntentFilter parameter
descriptions.

Bug: 5877117
Change-Id: Iccb16589a72d3180330f13ec224578a0c5ad81c6
2016-09-22 18:33:57 -07:00
Svetoslav Ganov
32ce3c8797 Merge "[DO NOT MERGE] Don't show account access request UI until app launched." into nyc-mr1-dev 2016-09-10 00:36:21 +00:00
Svet Ganov
d63cde7ba4 [DO NOT MERGE] Don't show account access request UI until app launched.
Sync adapters that don't have account access cannot run until
the user explicitly approves in the UI. This is spammy given
the user may not use the app right away. This change doesn't
show the notificaiton until the app has run.

bug:31162498

Change-Id: I1f4f2d2e9426f78763590e8aa542b94d6e93e488
2016-09-09 15:13:07 -07:00
TreeHugger Robot
295f5108f1 Merge "Add filter ordering" into nyc-mr1-dev 2016-09-09 19:59:46 +00:00
Kevin Hufnagle
aedfd75b1b docs: Fixed example of ACTION_VIEW intent
The ACTION_VIEW intent contained a content path that was inconsistent
with each of the other examples on the Intent reference page. Added
the "people" directory to the content path to remedy this issue.

Bug: 26405268
Change-Id: Ieb4f67e072338a108b9775d3bafad3d0773533d2
2016-09-08 21:56:25 -07:00
Svet Ganov
91d37f43c7 [DO NOT MERGE] While-list apps to access account if already saw it
Sync adapters without an account access cannot run until the
user approves the account access (for the case the account
access is not allowed by other policy such as being singed
with the same cert as the authenticator). However, if the
sync adapter package already got the account from another
app which means it already saw the account we white-list
the sync adapter app to access the account as it already
saw it - the bird is out of the cage.

bug:31162498

Change-Id: I2b72f3b0d6307561ed68db2f2e9c900b15e8d098
2016-09-08 16:46:46 -07:00
Todd Kennedy
c2e96d45d2 Add filter ordering
Filter ordering allows automatic disambiguation between multiple filters
that matching a pattern. Ordering currently only works for EphemeralResolveInfo
objects.

Bug: 30837021
Change-Id: Ia217218c7c7d159dbd75d7733c45556e690d06d2
2016-09-08 15:34:03 -07:00
Kevin Hufnagle
5add769f59 docs: Adjusted return value desc. for getApplicationEnabledSetting
The return value now references ApplicationInfo instead of
ComponentInfo.

Bug: 18123642
Change-Id: I595befe62dbce997becb689362abe5e4483b82c4
2016-08-29 16:50:17 -07:00