Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,949 Commits 3 Branches 0 Tags
6e86fa8a6b69dfb8c8117791dc0f100b80fb616f
Commit Graph

3224 Commits

Author SHA1 Message Date
Michael Jurka
691e0273c1 am d6277213: am f6a2133f: am 5f0a6009: Merge "Add API to get the built-in wallpaper" into klp-dev 
* commit 'd6277213f6cb52bff73200a62a125c343ac331a5':
  Add API to get the built-in wallpaper
 2013-10-10 08:24:10 -07:00
Michael Jurka
d6277213f6 am f6a2133f: am 5f0a6009: Merge "Add API to get the built-in wallpaper" into klp-dev 
* commit 'f6a2133fae6e8b5f8a8bee4afb5bda012bc88a1c':
  Add API to get the built-in wallpaper
 2013-10-09 22:57:09 -07:00
Michael Jurka
5f0a600925 Merge "Add API to get the built-in wallpaper" into klp-dev 2013-10-10 01:17:38 +00:00
Dianne Hackborn
0fae349f19 am 353ec474: am 8029493f: am f012b777: Merge "Fix some doc issues." into klp-dev 
* commit '353ec47422cbd1bb40f19e7ec9ec6b4f300ee3ab':
  Fix some doc issues.
 2013-10-09 18:05:32 -07:00
Dianne Hackborn
353ec47422 am 8029493f: am f012b777: Merge "Fix some doc issues." into klp-dev 
* commit '8029493fa2a37da41a73dde60dd17fa53cb6a77a':
  Fix some doc issues.
 2013-10-09 18:02:24 -07:00
Dianne Hackborn
ebc15ef80f Fix some doc issues. 
Bug: 11079621
Bug: 10461610
Bug: 10461369
Bug: 10461417
Change-Id: I7fd966f3cda0660ba20fa15d7164dcac95efadd3
 2013-10-09 17:36:57 -07:00
Jeff Sharkey
6699ae2b76 am 45d23585: am 11591b73: am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev 
* commit '45d2358510f9670ddf25cc49ee2639e3d41708f7':
  Surface outgoing Uri permission grants.
 2013-10-09 15:17:34 -07:00
Jeff Sharkey
45d2358510 am 11591b73: am b3da3db3: Merge "Surface outgoing Uri permission grants." into klp-dev 
* commit '11591b738d51e0d8e87e8825dc2fc7eaa517daa3':
  Surface outgoing Uri permission grants.
 2013-10-09 15:12:35 -07:00
Jeff Sharkey
b3da3db34a Merge "Surface outgoing Uri permission grants." into klp-dev 2013-10-09 22:07:11 +00:00
Jeff Sharkey
bcaac0adec Surface outgoing Uri permission grants. 
This enables apps to discover and clean up persisted Uri grants when
the underlying Uri becomes invalid, such as when an account is
removed.

Bug: 11142566
Change-Id: Ieeb36cb1155acf226327ebe91cdd30b822d69d1b
 2013-10-09 14:32:11 -07:00
Michael Jurka
b668d0ba7e Add API to get the built-in wallpaper 
Change-Id: I71cf4111fb4e36bd8e78eb47695861349dc1750b
 2013-10-09 12:12:34 -07:00
Jeff Sharkey
69bfc60ae0 am cb8c4501: am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev 
* commit 'cb8c4501d47ac492d48fbdd3b8e599fe620f2949':
  Install providers enabled after app started.
 2013-10-09 10:57:15 -07:00
Jeff Sharkey
cb8c4501d4 am d92dd8ff: am fcd8a39e: Merge "Install providers enabled after app started." into klp-dev 
* commit 'd92dd8ffcf3e7bce7d331e7ae9101ccba02baa67':
  Install providers enabled after app started.
 2013-10-09 10:53:35 -07:00
Jeff Sharkey
dd97f4233f Install providers enabled after app started. 
When an app has already been started, and a ContentProvider component
is enabled with DONT_KILL_APP, use the existing ProcessRecord to
install the provider.

Bug: 11118692
Change-Id: I990f18b337eb19768ee1db895f1e2eb982046cce
 2013-10-08 17:02:26 -07:00
Nick Kralevich
23c888acab am fa06d03e: am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'fa06d03edf7b40f62615c58233dbdf135bac11df':
  Fix App Ops permission mapping structure.
 2013-10-08 16:02:54 -07:00
Dianne Hackborn
e02c3eec84 am 19a6a86a: am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit '19a6a86ae148b3ee15ef7499302e9ed7c1bea682':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 16:02:34 -07:00
Nick Kralevich
fa06d03edf am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit '0b8fd029c052784d4adee940eaa904a339db6716':
  Fix App Ops permission mapping structure.
 2013-10-08 14:33:40 -07:00
Nick Kralevich
0b8fd029c0 am a299862d: Merge "Fix App Ops permission mapping structure." 
* commit 'a299862dd2d46fda54678df07db66bef1a63bb9b':
  Fix App Ops permission mapping structure.
 2013-10-08 14:30:11 -07:00
Dianne Hackborn
19a6a86ae1 am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev 
* commit 'c35ae6e784dcf1a3480fbcc12e09d51bdffce686':
  Wrong argument: handleUnstableProviderDiedLocked
 2013-10-08 13:36:53 -07:00
You Kim
bc74de6722 Wrong argument: handleUnstableProviderDiedLocked 
mProvider is HashMap<ProviderKey, ProviderClientRecord>. String
is not correct object for KEY. Complete removal using iterator.

Bug: 11086495

Change-Id: I51e4576544ef02ede6f96938689dd4e43ec6eb4f
 2013-10-08 12:22:30 -07:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:12:16 -07:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>. 
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
 2013-10-07 14:19:13 -07:00
Robert Craig
f97616c7ba Fix App Ops permission mapping structure. 
The entry to map the post notification op
to a permission is at the wrong offset
within the sOpPerms array. This patch
fixes the issue.

Change-Id: Ia241d274e484b6a24edbfb17b87bb887b61f1ee1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-10-07 12:43:06 -04:00
Dianne Hackborn
6588538ec5 am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
  Implement issue #11050739: Show swapped out RAM
 2013-10-04 09:11:17 -07:00
Dianne Hackborn
4bfeed9499 am 61509ca5: am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '61509ca5bafbe59e29e1eaaaa938c5a668352cba':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-04 09:11:14 -07:00
Dianne Hackborn
54588821b1 am 5eaac1ce: am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit '5eaac1ce334c0a488fee44d1a9ef5f20ff7d84ea':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-04 09:11:10 -07:00
Christopher Tate
f2d9391b33 am 64884eef: am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit '64884eef54bb110cead05d9b3f1a5928d5cf5349':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 16:43:20 -07:00
Dianne Hackborn
7c55154d47 am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
  Implement issue #11050739: Show swapped out RAM
 2013-10-03 15:39:36 -07:00
Dianne Hackborn
61509ca5ba am 479dde0b: am 6a6f96a2: Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 
* commit '479dde0bc21a1e9d0bb8dad801cfe015f6c7e416':
  Fix issue #10378741: configupdater needs to be explicit when it calls startService()
 2013-10-03 15:39:33 -07:00
Dianne Hackborn
5eaac1ce33 am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 
* commit 'e31f959c68a9dfa00daa5b5580ced31badfb1127':
  Fix issue #11044267: AppOpsManager.startWatchingMode should take a String
 2013-10-03 15:39:30 -07:00
Christopher Tate
64884eef54 am b61c8219: am ef4f8222: Merge "Fix cross-process race in initial files/cache dir creation" into klp-dev 
* commit 'b61c82190d9d16cd4a7dff8af81aff7f43c19cc4':
  Fix cross-process race in initial files/cache dir creation
 2013-10-03 15:38:47 -07:00
Dianne Hackborn
0d763a901e Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev 2013-10-03 17:45:42 +00:00
Dianne Hackborn
6a6f96a296 Merge "Fix issue #10378741: configupdater needs to be explicit when it calls startService()" into klp-dev 2013-10-03 17:44:38 +00:00
Dianne Hackborn
d143d1ffd7 Merge "Fix issue #11044267: AppOpsManager.startWatchingMode should take a String" into klp-dev 2013-10-03 17:44:18 +00:00
Dianne Hackborn
fd6c7b12c3 Fix issue #10378741: configupdater needs to be explicit when it calls startService() 
Not enough time to fix everything, so instead we'll make it a warning
in this release and finish up turning it into a target-SDK based
exception in the next release.

Change-Id: I5aae64a1225a145f03ba4162238b53d5e401aba2
 2013-10-03 10:42:26 -07:00
Christopher Tate
cc866da37d Fix cross-process race in initial files/cache dir creation 
Apps that run components in separate processes, especially that
host providers in separate processes, can hit a race condition
where two processes simultaneously discover that the files/cache
dir must be created, then each calls mkdirs().  One of these will
fail not because the dir couldn't be created, but because it lost
the race and mkdirs() returned false to signal that it already
existed -- and this was assumed to be a hard failure.

We now recheck existence after a mkdirs() failure to discern this
case and proceed appropriately.

Bug 10515463

Change-Id: I13fbdd838921223f75ab11faa47291c82b21c650
 2013-10-02 18:16:24 -07:00
Dianne Hackborn
8883ced18a Implement issue #11050739: Show swapped out RAM 
Add "swapped out" field to mem info everywhere.

Change-Id: I89abe8eb0e91fa5c193da93815dc592593c8a3c8
 2013-10-02 17:40:05 -07:00
Jeff Sharkey
11e9274fc0 am c7ce6985: am 50a8663d: am 437befc1: Merge "Docs change: annotate media intent actions." into klp-dev 
* commit 'c7ce69853ad8297ac5cad4a1e91b6f40f0d671d9':
  Docs change: annotate media intent actions.
 2013-10-02 10:48:14 -07:00
Jeff Sharkey
c7ce69853a am 50a8663d: am 437befc1: Merge "Docs change: annotate media intent actions." into klp-dev 
* commit '50a8663d261a3fd7b26c1a17beac86090e3da4c8':
  Docs change: annotate media intent actions.
 2013-10-02 10:45:28 -07:00
Dianne Hackborn
e4cb66fd77 Fix issue #11044267: AppOpsManager.startWatchingMode should take a String 
Change-Id: I193a738f2e4ef147c22fb46cfa34ec14ad95d192
 2013-10-02 10:36:15 -07:00
Jeff Sharkey
32cd2fb596 Docs change: annotate media intent actions. 
Bug: 11043141
Change-Id: I66777c5ce25014d8e64da5b4ce3f70334befb0b7
 2013-10-02 10:11:25 -07:00
Jeff Sharkey
b6ab3b982b am 7f60e70e: am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '7f60e70e815d381035b141843395830407c198d9':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:43:21 -07:00
Jeff Sharkey
7f60e70e81 am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev 
* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.
 2013-10-02 09:35:14 -07:00
Romain Guy
c3e21ba1ce am bb1d4d38: am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit 'bb1d4d3896b781905bbf3ccbd5d5617da61cc3eb':
  Fragement, or Fragment: that is the question
 2013-10-01 18:46:05 -07:00
Fabrice Di Meglio
c993e7447d Merge "Update TimePicker widget and its related dialog" 2013-10-01 18:10:21 +00:00
Jeff Sharkey
7aa7601c09 Detect wedged ContentProviders, treat as ANR. 
All ContentProvider calls are currently blocking, making it hard for
an app to recover when a remote provider is wedged.  This change adds
hidden support to ContentProviderClient to timeout remote calls,
treating them as ANRs.  This behavior is disabled by default.

Update DocumentsUI to use a 20 second timeout whenever interacting
with a storage provider.

Bug: 10993301, 10819461, 10852518
Change-Id: I10fa3c425c6a7225fff9cb7a0a07659028230cd3
 2013-10-01 09:50:41 -07:00
Daniel Sandler
5e833d6f57 am 723ad75e: Merge "API cleanups for Notification." into klp-dev 
* commit '723ad75e107f57dc541dfca600745895e1251974':
  API cleanups for Notification.
 2013-09-30 17:08:06 -07:00
Romain Guy
bb1d4d3896 am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit 'd6c1870d434562a10e015915dd9da9f8a956661c':
  Fragement, or Fragment: that is the question
 2013-09-30 16:23:05 -07:00
Romain Guy
d6c1870d43 am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit '5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
  Fragement, or Fragment: that is the question
 2013-09-30 16:19:22 -07:00