Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,906 Commits 3 Branches 0 Tags
34a617456b162a484f166375e1b24fdbc2c95450
Commit Graph

131906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emily Bernier
34a617456b am 9c32cd49: Fix build. 
* commit '9c32cd498a8067d4487a97fbf93d8587bfcec1fd':
  Fix build.
 2014-04-23 19:52:05 +00:00
Emily Bernier
9c32cd498a Fix build. 
Don't link to MANAGE_USERS permission in Javadoc.

Change-Id: Iad1391a0281a3fad06529a86b277f787791e94fc
 2014-04-23 15:42:10 -04:00
Craig Mautner
d76b43a86f am 5723feba: Merge "Introduce PersistableBundle" 
* commit '5723febadc1877c045389afffa111913698e32e2':
  Introduce PersistableBundle
 2014-04-23 18:53:37 +00:00
Craig Mautner
5723febadc Merge "Introduce PersistableBundle" 2014-04-23 18:48:56 +00:00
Emily Bernier
9601bbb473 am 8a0fa6e8: Merge "Allow device or profile owner app to modify user restrictions." 
* commit '8a0fa6e823ddbdfd17869d52f838b1cc0a46bd2b':
  Allow device or profile owner app to modify user restrictions.
 2014-04-23 18:32:21 +00:00
Emily Bernier
8a0fa6e823 Merge "Allow device or profile owner app to modify user restrictions." 2014-04-23 18:27:45 +00:00
Emily Bernier
7a2b4d11c7 Allow device or profile owner app to modify user restrictions. 
Currently this is gated on being a system or root app with the
MANAGE_USERS permission; third-party MDM apps set as device or profile
owner should have this ability as well.

Bug: 13585295

Change-Id: I61d21b13b9ec66fc0cb497ec2007ee732461d448
 2014-04-23 14:20:15 -04:00
John Spurlock
2550e9e6b8 am 4e8cf150: Merge "Quick settings: interim tile shuffle." 
* commit '4e8cf1508f22f88203cd9bf4467aaddd3f4502c6':
  Quick settings: interim tile shuffle.
 2014-04-23 17:50:37 +00:00
John Spurlock
4e8cf1508f Merge "Quick settings: interim tile shuffle." 2014-04-23 17:46:45 +00:00
Alan Viverette
8f28548221 am 40619ae8: Prevent new ripples when max reached 
* commit '40619ae8016248979c0147f6bcc9bfd41f07bb4a':
  Prevent new ripples when max reached
 2014-04-23 17:41:27 +00:00
Alan Viverette
b7a11d78c4 am 70ad9bc0: Fix null and bounds checks 
* commit '70ad9bc03341cc0a5b8d6c9c1f43afac6bcc9c62':
  Fix null and bounds checks
 2014-04-23 17:41:18 +00:00
Alan Viverette
40619ae801 Prevent new ripples when max reached 
BUG: 14270202
Change-Id: I53b0522a175eca043ba1cf007377312d03fd8f6d
 2014-04-23 10:33:47 -07:00
John Spurlock
0f407279ff Quick settings: interim tile shuffle. 
Ensure BT and location appear in 3x3 mode, by:
 - Adding the three conditional accessibility tiles at the end
 - Moving BT and location above airplane mode (available via global actions)
   and zen mode (sorry).

Bug:14162372
Change-Id: I6d79a7442f091d58643c5124cfe0dcbf6e3cd46f
 2014-04-23 13:22:59 -04:00
Alan Viverette
70ad9bc033 Fix null and bounds checks 
BUG: 14271950
BUG: 14271753
BUG: 14270202
Change-Id: I8708107d3803b170a323f584a268ea6b096458ce
 2014-04-23 10:20:11 -07:00
Neil Fuller
13b1d7000d am ceb5d17f: am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'ceb5d17f6a2f5c144948ada1d59ec4f12da64799':
  Changes to support asynchronous close interruption
 2014-04-23 16:55:04 +00:00
Neil Fuller
ceb5d17f6a am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'd720ef541d06be87de3b3e03c1e7fb349299a21f':
  Changes to support asynchronous close interruption
 2014-04-23 16:51:47 +00:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
 2014-04-23 16:48:34 +00:00
Neil Fuller
caf6497b9a am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption
 2014-04-23 16:45:15 +00:00
Neil Fuller
683cf1bffe Merge "Changes to support asynchronous close interruption" 2014-04-23 16:41:17 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption 
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
 2014-04-23 16:40:35 +00:00
Jorim Jaggi
1083139ad7 am e84d544f: Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." 
* commit 'e84d544fe4b238efc408280ec7e01f9c3f04a1b6':
  Move redaction logic showing from Keyguard to PhoneStatusBar.
 2014-04-23 16:28:27 +00:00
Jorim Jaggi
e84d544fe4 Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." 2014-04-23 16:24:04 +00:00
Selim Cinek
62608dadb0 am b6e0e122: Fixed a bug where holes could occur in the new shade. 
* commit 'b6e0e1228bfd38f5ba971194afc5c31d99980fa1':
  Fixed a bug where holes could occur in the new shade.
 2014-04-23 16:10:55 +00:00
Selim Cinek
b6e0e1228b Fixed a bug where holes could occur in the new shade. 
When a notification was never layouted before and it was the first
child, holes could occur in the shade when dragging down, because its
maximum allowed height was wrongly calculated.

Bug: 14080722
Change-Id: Ia10f9dd95f917d492411aec1da4ae0fc4d8f33d5
 2014-04-23 17:50:48 +02:00
Jorim Jaggi
1568250853 Move redaction logic showing from Keyguard to PhoneStatusBar. 
This removes a race condition and makes redaction more stable.

Change-Id: I4084cdf490c0e52fe26f45cb00524e0876a068bc
 2014-04-23 17:02:25 +02:00
Jeff Sharkey
3e5991c1eb am 21de56a9: Add directory selection to DocumentsProvider. 
* commit '21de56a94668e0fda1b8bb4ee4f99a09b40d28fd':
  Add directory selection to DocumentsProvider.
 2014-04-23 07:15:32 +00:00
Jeff Sharkey
d5f8b4d26a am 846318a3: Allow prefix-based Uri permission grants. 
* commit '846318a3250fa95f47a9decfbffb05a31dbd0006':
  Allow prefix-based Uri permission grants.
 2014-04-23 07:15:26 +00:00
Jeff Sharkey
21de56a946 Add directory selection to DocumentsProvider. 
Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree.  Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12.  Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12.  Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories.  Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way.  Override openAssetFile()
to pass through CancellationSignal.  Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07
 2014-04-22 22:18:21 -07:00
Jeff Sharkey
846318a325 Allow prefix-based Uri permission grants. 
Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments.  For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission().  Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key.  (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions.  Move prefix
matching logic to Uri and add tests.  Add new flags to "am" tool, and
various internal uses around Intent and Context.  Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
 2014-04-22 21:06:49 -07:00
Andrew Solovay
d018eb3519 am fb5d9f33: am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit 'fb5d9f338153f569775bbc76177cab05441999c1':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 03:02:02 +00:00
Andrew Solovay
fb5d9f3381 am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit 'e4593554ddcdaeb93a6d624fbd6641c4624de536':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:55:21 +00:00
Andrew Solovay
e4593554dd am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '32117212fc48872b557044ff25ba6b8d9ace5738':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:51:48 +00:00
Andrew Solovay
32117212fc am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:47:50 +00:00
Andrew Solovay
6c5bfa2f34 am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '026c82b1916a9e2b48b9ff62ffeb935d63935a68':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:44:06 +00:00
Baligh Uddin
4e91186bdd am d064424e: (-s ours) am 128f5efa: (-s ours) am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd064424e2f461f61ae51459bc2c819105444aeab':
  Import translations. DO NOT MERGE
 2014-04-23 02:29:54 +00:00
Andrew Solovay
026c82b191 Doc: Fixed a code sample to use standard methods. Also some formatting 
tweaks.

Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.

(Update: Fixed indentation that I broke on a code sample.)

Bug: 14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1
 2014-04-22 19:29:07 -07:00
Alan Viverette
d8b34e9f3e am 2b38072e: Merge "Add ripple to switches, radio buttons, check boxes, seek bars" 
* commit '2b38072e1fb4f158c8de9d92825f72145c9343bb':
  Add ripple to switches, radio buttons, check boxes, seek bars
 2014-04-23 02:24:37 +00:00
Baligh Uddin
fcc156a353 am a822d393: (-s ours) am 97f9607f: (-s ours) am d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'a822d393bf4b43665861c0ad0a8f8b37cf9775ed':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:30 +00:00
Baligh Uddin
61a678e7b9 am 3e1668fd: (-s ours) am b38d00d5: (-s ours) am abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '3e1668fd04827da04eaa7ff45df1edf658a895e1':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:26 +00:00
Baligh Uddin
589646dc46 am 6e1ac371: (-s ours) am c1c6de3f: (-s ours) am c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '6e1ac37150d840573fd8aec60ae1ea18ea91e075':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:23 +00:00
Baligh Uddin
6fde3fb23c am d104a377: (-s ours) am 6c8e9296: (-s ours) am 13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd104a377ab9e9df4b38beba4aab40685e2709a64':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:21 +00:00
Baligh Uddin
c2cecf36d6 am d66b10db: (-s ours) am e22700ac: (-s ours) am 611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd66b10db019ac079a1f0b6f357bbc140922f248c':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:18 +00:00
Baligh Uddin
7ac69c211a am c925a371: (-s ours) am 9ee5df4b: (-s ours) am 4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'c925a37100015314a15b1b6eed68f39c8c657839':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:15 +00:00
Baligh Uddin
7dcbb5a538 am 22ee2fe7: (-s ours) am 0d0bbe4e: (-s ours) am 2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '22ee2fe70bb01e8a7db8e2cb28b8c2fba56b01c5':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:12 +00:00
Baligh Uddin
55f5fe527a am 3411339b: (-s ours) am c72133a4: (-s ours) am 5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '3411339b1f50405c8fdc9f8d00e3e3a749aceae5':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:08 +00:00
Baligh Uddin
e582a481a4 am b86eb2b8: (-s ours) am ed8c4096: (-s ours) am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b86eb2b8b75a65e69331256c026df68fe687bf57':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:04 +00:00
Baligh Uddin
b0e6556de5 am 4ae0268e: (-s ours) am 44cbb9f2: (-s ours) am 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '4ae0268ec57c5b4a683d685c209942dc2d0b78d7':
  Import translations. DO NOT MERGE
 2014-04-23 02:24:01 +00:00
Baligh Uddin
4281f78242 am 59bb0de9: (-s ours) am b491f832: (-s ours) am 42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '59bb0de92f712a605a9e19bf0b16fcaa32f45dbd':
  Import translations. DO NOT MERGE
 2014-04-23 02:23:58 +00:00
Baligh Uddin
66301958aa am 3a1c6b73: (-s ours) am 61f9ac26: (-s ours) am 9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '3a1c6b73018c96896dab966f5b62521de4bc0120':
  Import translations. DO NOT MERGE
 2014-04-23 02:23:55 +00:00
Baligh Uddin
d064424e2f am 128f5efa: (-s ours) am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '128f5efa7680b0a21e17c1a7ad7351ee031a4fd1':
  Import translations. DO NOT MERGE
 2014-04-23 02:20:28 +00:00