Commit Graph

3365 Commits

Author SHA1 Message Date
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Svet Ganov
68ffcf883c Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 2015-07-01 23:59:21 +00:00
Svet Ganov
99b6043dad Teach receivers, activities, providers, and services app ops.
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
2015-07-01 16:20:00 -07:00
Dianne Hackborn
76664d9dcf Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-01 22:21:10 +00:00
Dianne Hackborn
de15edaa9b Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
...to an explicit toggle to enable in Settings

Add a new permission flag, saying the permission can be automatically
granted to pre-api-23 apps.  Apply this to SYSTEM_ALERT_WINDOW.

Change-Id: I24a0ceabe7e9f5e458a864d30eda2696ad14a699
2015-07-01 12:37:00 -07:00
Nicolas Prevot
107f7b7bec Fix the case where an intent bounces several times between users.
An intent may bounce several times between users.
In this case, we want mContentUserHint to refer to the original
user.

BUG:19656340
Change-Id: I22a35fab0c228140dcb223899f5e38ff33ee5aed
2015-07-01 17:05:18 +01:00
Svetoslav
0010b70bea Grant permissions to headless system calendar/contacts sync adapters.
bug:21861781

Change-Id: I5f9905a23ba1b23e387adf2cea842172d34207b0
2015-06-30 18:22:20 -07:00
Svet Ganov
67a461eca8 Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev 2015-07-01 00:55:58 +00:00
Svet Ganov
ffd25bbed1 Rename uses-permission-m to uses-permission-23
bug:20072113

Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
2015-06-30 23:06:41 +00:00
Benjamin Franz
01b079f7d2 Merge "Make ContentObservers work across profiles" into mnc-dev 2015-06-30 07:45:50 +00:00
Svetoslav
cdfd230a39 Grant default permissons to the default SMS, Phone, Browser app.
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.

bug:22104986

Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
2015-06-29 17:44:19 -07:00
Benjamin Franz
adea1918be Make ContentObservers work across profiles
Currently registering for changes to a cross-user Uri does not work, as
the calling user id is used to identify the Uri. Change this to use the
userId the Uri is associated with. In order to protect Uris across
users, we only allow registration for a Uri when the caller has read
permission. We also only allow notify calls from across users when the
caller has write permission to the Uri.

Bug: 19312280
Change-Id: Ide216b09980ed5ebefe9b37c946dd8160167809f
2015-06-29 16:17:55 +01:00
Christopher Tate
b035c6d9a6 Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 2015-06-27 00:48:10 +00:00
Christopher Tate
2134744efd Properly scope the "only http/https schemes" intent filter semantics
That restriction applies only to default-app linkage verification, and
not to any general questions of "is this app effectively a web browser?"

Bug 21688029

Change-Id: I9f6a7bc6dcac5e12ee07f8da6465ad51c1aeddfb
2015-06-26 17:45:22 -07:00
Rubin Xu
0a202eac01 Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 2015-06-26 22:36:13 +00:00
Dianne Hackborn
ca8e6da41c Fix issue #22023824: Download folder is not created in internal storage
The media provider and some other things need to be given storage access.

Also, seems like we should give storage access to the camera app as well.

And add a dump dump command that will dump data about a particular
permission name.

Change-Id: Idaaa9bba2ff4dc95290cf6d17e5df933df91e909
2015-06-26 13:28:29 -07:00
Rubin Xu
e8490f1d78 Use StorageManager.wipeAdoptableDisks to wipe external disks
Retire FORMAT_AND_FACTORY_RESET which is more fragile.

Bug: 9433509
Change-Id: I158ee987274bb4db41d466de9f1e3c60ffc1d140
2015-06-26 15:58:21 +01:00
Jeff Sharkey
9527b223a9 Let's reinvent storage, yet again!
Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app.  This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.

The only thing left that can change dynamically is the filesystem
itself, so let's do that.  This means changing the FUSE daemon to
present itself as three different views:

/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access

There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.

During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions.  When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.

Bug: 21858077
Change-Id: I62fb25d126dd815aea699b33d580e3afb90f8fd2
2015-06-25 22:25:48 -07:00
Svetoslav
263b6e6983 Merge "Prevent certain actions of app has revoked permissions" into mnc-dev 2015-06-25 18:20:16 +00:00
Svetoslav
7008b51817 Prevent certain actions of app has revoked permissions
bug:21808294

Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa
2015-06-25 10:55:11 -07:00
Christopher Tate
413020a6ca Require that verified intent filters only have http/https <data> decls
It is malformed to write a single intent filter like this:

  <intent-filter android:autoVerify="true">
    <data android:host="foo.example"
          android:path="/"
          android:scheme="http" />
    <data android:host="*"
          android:path="/custom"
          android:scheme="fooexamplecustomscheme" />
  </intent-filter>

In practice this app is accidentally defining a filter that will match
"http://*".  This is now detected, and will never be auto-verified for
any of the mentioned domains.

Verified intent filters must *only* handle the http & https schemes.

Bug 21920537

Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
2015-06-24 13:16:20 -07:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions.
This reverts commit ed5ff51b2c.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
2015-06-23 23:03:55 +00:00
Jeff Davidson
8d9ad19341 Merge "Default permissions for carrier apps." into mnc-dev 2015-06-23 20:43:06 +00:00
Amith Yamasani
0bf8f7cc39 Runtime permissions cannot be set on legacy apps by device policy
Clarify docs that runtime permissions can be granted or revoked by
a profile owner/device owner only for MNC apps and not legacy apps.

Check the targetSdkVersion and return false if legacy app.

Remove all policy flags from permissions when cleaning up
a device or profile owner.

Bug: 21835304
Bug: 21889278
Change-Id: I4271394737990983449048d112a1830f9d0f2d78
2015-06-23 12:01:36 -07:00
Jeff Davidson
2a88031208 Default permissions for carrier apps.
Grant permissions in the PHONE and LOCATION buckets to default carrier
apps as defined by the telephony stack. Provide a system API to grant
default permissions for carrier apps, as the set of apps may change
when a new SIM is inserted.

Since the phone process is separate from the system process, we need
to allow for binder calls to these APIs.

Also fix a log tag that is too long (android.util.Log drops messages
silently if the tag is > 23 characters).

Bug: 21696731
Change-Id: I98ca0c49c69f621f835ba57c1fd0505f2cec0d0d
2015-06-23 09:55:23 -07:00
Dianne Hackborn
6af40c8338 Merge "Fix issue #21799741: AbstractThreadedSyncAdapter crashes..." into mnc-dev 2015-06-23 16:45:50 +00:00
Christopher Tate
6d2268a576 Merge "Back up / restore default app and intent filter verification state" into mnc-dev 2015-06-23 01:02:12 +00:00
Dianne Hackborn
d01ed46c63 Fix issue #21799741: AbstractThreadedSyncAdapter crashes...
...when permissions aren't granted

Eat the SecurityException, turn it into a new callback.

Change-Id: Ibeffce061aa51beba097c90f431de07ce70b3c4e
2015-06-22 17:41:44 -07:00
Christopher Tate
6038d15cbc Back up / restore default app and intent filter verification state
For apps not present on device, the state inherited from the ancestral
device is applied when the app is ultimately installed.

Bug 20144515

Change-Id: Ie05b4f1751357fc62f14e259da174b8cf465e913
2015-06-22 17:20:26 -07:00
Matthew Williams
8b1db0746f Merge "Cancel Syncs that aren't making progress." into mnc-dev 2015-06-22 21:41:49 +00:00
Matthew Williams
1967c8ddd5 Cancel Syncs that aren't making progress.
BUG: 18266674
1) If a sync has up/downloaded less than 10bytes in 60 seconds it is
considered to be making no progress and is summarily cancelled.

2) Apply a 30min hard time-out to initialization syncs.

Note that there is little proof that cancelling a sync has an
impact. All it results in is a Thread.interrupt on the sync
thread, which the adapter must itself implement. To this effect
this CL also updates the javadoc to make this clearer, and adds
some (unimplemented) threats about killing the hosting process.

Change-Id: I83c447648152ccbf76bb1fbd7e9216e01a37952f
2015-06-22 14:36:36 -07:00
Kenny Guy
434235496c Merge "Fix LauncherApps registerCallback adding duplicate callbacks." into mnc-dev 2015-06-22 16:50:05 +00:00
Svet Ganov
1e575a0f32 Merge "Only grant runtime permissions to special components." into mnc-dev 2015-06-19 22:26:32 +00:00
Svet Ganov
adc1cf4604 Only grant runtime permissions to special components.
Now runtime permissions are granted only to components that are
part of the system or perform special system operations. For
exmple, the shell UID gets its runtime permissions granted by
default and the default phone app gets the phone permissions
granted by default.

bug:21764803

Change-Id: If8b8cadbd1980ffe7a6fc15bbb5f54a425f6e8f9
2015-06-19 15:17:56 -07:00
Amith Yamasani
b94761d0a4 Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 2015-06-19 22:08:13 +00:00
Amith Yamasani
37a40c24de App Standby : Association between content providers and their sync adapter
Set sync adapters to active if the associated content providers are used
at foreground process state.

Minimize how frequently published content providers are reported by
keeping track of last reported time.

Also cache sync adapters associated with an authority in SyncManager.

Bug: 21785111
Change-Id: Ic2c8cb6a27f005d1a1d0aad21d36b1510160753a
2015-06-19 15:04:58 -07:00
Kenny Guy
172a21697d Fix LauncherApps registerCallback adding duplicate callbacks.
LauncherApps wraps the callback passed so checking
using List.contains isn't valid.

Bug: 21947184
Change-Id: Ice0973935574adda15e295073faedb62374ff627
2015-06-19 17:21:28 +01:00
Wale Ogunwale
15b9fd268a Don't write IntentFilter autoVerify field to xml if false.
Bug: 21205789
Change-Id: I650265eeec99d470ae2f089d8ae3ef3c866c0096
2015-06-19 08:59:52 -07:00
Sudheer Shanka
a408061cc7 Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 2015-06-19 09:25:59 +00:00
Christopher Tate
728b7500b3 Merge "Document possible null returns in PackageManager" into mnc-dev 2015-06-18 20:53:12 +00:00
Christopher Tate
abe6580199 Document possible null returns in PackageManager
In particular queryIntentServices() but also a few others.

Bug 19127758

Change-Id: I590605ce4870b2ab300385678df8917cfade60f9
2015-06-18 13:48:42 -07:00
Dianne Hackborn
a750a63d63 Fix issue #21814207 and issue #21814212 (alarm manager)
Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks.

Introduce a whole new infrastructure for providing options when
sending broadcasts, much like ActivityOptions.  There is a single
option right now, asking the activity manager to apply a tempory
whitelist to each receiver of the broadcast.

Issue #21814212: Need to allow configuration of alarm manager parameters

The various alarm manager timing configurations are not modifiable
through settings, much like DeviceIdleController.  Also did a few
tweaks in the existing DeviceIdleController impl.

Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
2015-06-17 11:41:45 -07:00
dcashman
acc2df21de Merge "Add keyset support for ECDSA public keys." into mnc-dev 2015-06-16 22:14:35 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
2015-06-15 11:53:59 -07:00
Makoto Onuki
bd25b5f602 Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 2015-06-13 00:28:20 +00:00
Makoto Onuki
34bdcdb105 Fix ArrayIndexOutOfBoundsException in Transport.query
The bug was that it used getCount() instead of getColumnCount().

Bug 21727804

Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
2015-06-12 17:16:23 -07:00
Jeff Sharkey
54b65ff300 Merge "Annotate ContentProviderClient arguments." into mnc-dev 2015-06-12 16:57:56 +00:00
Jeff Sharkey
73ed509d44 Annotate ContentProviderClient arguments.
Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: Id0a208a38c5a9ea19dddbe60c65d285645d08bb0
2015-06-12 09:49:31 -07:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00