drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,819 Commits 1 Branch 0 Tags
Commit Graph

196819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
d19555d92c am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev 
* commit '38cae6c8bcb86236b21d69f852473351c0c1d82a':
  Reconcile private volumes when mounted.
 2015-07-06 18:12:32 +00:00
Andrew Solovay
afea7a9982 docs: Updating permissions preview for Preview 2. 
Currently just contains doc additions/clarifications that apply to
both Preview 1 and Preview 2, and also the addition of the new
'storage' bucket and the new shouldShowRequestPermissionRationale()
method.

See first comment for doc stage location.

Change-Id: I0b97741c45e117c5de3fa1a85c9ba0d5e927fa8f
 2015-07-06 11:09:15 -07:00
Raph Levien
441fc0fc68 Merge "Fix problems with StaticLayout indentation" into mnc-dev 2015-07-06 18:08:41 +00:00
Eino-Ville Talvala
3fc066f561 am 539d18c5: Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 
* commit '539d18c5a9eac6b2cf23b3af38e2635279a106dd':
  Camera2: Remove FREEFORM cropping requirement from FULL
 2015-07-06 18:06:07 +00:00
Dianne Hackborn
1a053eaf14 am dcd96ead: Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev 
* commit 'dcd96ead8457466fb3dfb5978eb1e7e5b560ba91':
  Maybe fix issue #22283836 -- package manager NPE.
 2015-07-06 18:06:03 +00:00
Geoff Mendal
e02705af0c am e2222d12: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e2222d12c8338ef4aa1e653583507937aad53cd4':
  Import translations. DO NOT MERGE
 2015-07-06 18:05:29 +00:00
George Mount
b31990920a am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev 
* commit '20f71891c4ae420398b96cc6a77f0c43316e6717':
  Fix Fade out during Activity Transition.
 2015-07-06 18:05:23 +00:00
Jason Monk
e9b1e36559 am d369d074: Merge "Fix wifi crash" into mnc-dev 
* commit 'd369d074f5bdbcc9229bf52e12f3bde025cf41cd':
  Fix wifi crash
 2015-07-06 18:05:19 +00:00
Makoto Onuki
164d229a1c am dfd6301f: Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 
* commit 'dfd6301fa2570ae5b012dd964847531bdfdb3f4b':
  If user ejects a storage from details, take user to... ... the storage list view
 2015-07-06 18:05:04 +00:00
Barnaby James
2691d08c3b am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 
* commit 'c1e3ac321faea5717e1767bf2091334dde310eb7':
  Minor doc fixes for VoiceInteractor.
 2015-07-06 18:04:58 +00:00
Amith Yamasani
b41e36bac5 am a72eac60: Fix a typo causing NPE in restricted profiles 
* commit 'a72eac60c7a34089c8e288f03ce031172e3b36b4':
  Fix a typo causing NPE in restricted profiles
 2015-07-06 18:04:50 +00:00
Raph Levien
3be9eb4611 am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev 
* commit '401aa9d807bdc568f26cd40bfc96d26449267678':
  Clean up Hyphenator file reading
 2015-07-06 18:04:45 +00:00
Alan Viverette
2b460d08dc Remember focused child during layout when adapter has stable IDs 
Ensures behavior is consistent between accessibility focus retention and
keyboard focus retention. Attempts to retain focus when possible.

Bug: 22207825
Change-Id: I62360892f52d456e2128f93a2dbf18f2bc934ef3
 2015-07-06 11:01:50 -07:00
Adam Lesinski
1a257545b2 Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 2015-07-06 18:00:33 +00:00
Jeff Sharkey
7fd3c296f1 Merge "Permission to view shared storage for all users." into mnc-dev 2015-07-06 17:59:11 +00:00
Jeff Sharkey
6d842f63a0 Merge "Fix DocumentsUI animation regression." into mnc-dev 2015-07-06 17:58:10 +00:00
Jeff Sharkey
246d698499 Merge "Handle missing migration source volume." into mnc-dev 2015-07-06 17:57:52 +00:00
Jeff Sharkey
38cae6c8bc Merge "Reconcile private volumes when mounted." into mnc-dev 2015-07-06 17:57:46 +00:00
Jeff Sharkey
32e80d7588 Permission to view shared storage for all users. 
Typical apps are restricted so they can only view shared storage
belonging to the user they're running as.  However, a handful of
system components need access to shared storage across all users,
such as DefaultContainerService and SystemUI.

Since WRITE_MEDIA_STORAGE already offers this functionality by
bypassing any FUSE emulation, reuse it to grant the "sdcard_rw" GID
which is no longer handed out to third-party apps.  Then we change
the FUSE daemon to allow the "sdcard_rw" GID to see shared storage
of all users.

Bug: 19995822
Change-Id: I504c2a179ba74f142ed0d32da5baa69f4212cd82
 2015-07-06 10:54:28 -07:00
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00
Dianne Hackborn
dcd96ead84 Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev 2015-07-06 17:50:28 +00:00
David Friedman
335aa228c3 Docs: Localized pages for Distribution on DAC. 
Bug: 20503707

Change-Id: I7e45012b34d57bad426d930399eb1afbf3f5f859
 2015-07-06 10:38:32 -07:00
Geoff Mendal
e2222d12c8 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 17:34:06 +00:00
Geoff Mendal
85bac1cc19 Import translations. DO NOT MERGE 
Change-Id: I6c69d2d259e0341bb42765b0940a607599df666b
Auto-generated-cl: translation import
 2015-07-06 10:29:06 -07:00
George Mount
20f71891c4 Merge "Fix Fade out during Activity Transition." into mnc-dev 2015-07-06 17:25:46 +00:00
George Mount
a7478ab9a7 Fix Fade out during Activity Transition. 
Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b
 2015-07-06 10:23:13 -07:00
Jason Monk
d369d074f5 Merge "Fix wifi crash" into mnc-dev 2015-07-06 17:19:19 +00:00
Adam Lesinski
f7808b7cf0 BatteryStats: Fix issue with method parameter order... 
Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228
 2015-07-06 10:17:24 -07:00
Makoto Onuki
dfd6301fa2 Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 2015-07-06 17:13:29 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Jean-Michel Trivi
462045e89a Ringtone: add support for volume control and looping 
Bug 22182606

Change-Id: Ied910b9fe02a5da9c4822a107ee884677c8b4991
 2015-07-06 10:06:02 -07:00
Jason Monk
dbd05a98e5 Fix wifi crash 
Handle clearing state for resume on the same worker thread as everything
else, this way there can't be concurrent modification.

Bug: 22040227
Change-Id: I9ac78a19fc126c8103f3218e657ca93911d3890d
 2015-07-06 13:05:43 -04:00
Dianne Hackborn
167d588b8b Maybe fix issue #22283836 -- package manager NPE. 
Change-Id: I0383b9a4f1e0b872b3b427e6ad42fd8aa309b7ab
 2015-07-06 09:52:59 -07:00
Amith Yamasani
a72eac60c7 Fix a typo causing NPE in restricted profiles 
Bug: 22287398
Change-Id: Iec19d890c7b0b7ffed3381dc3f5a9b3e761362a7
 2015-07-06 09:24:08 -07:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00
Raph Levien
c3f2f7b93b Clean up Hyphenator file reading 
The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a
 2015-07-06 09:01:36 -07:00
Svet Ganov
d8c2bbcf65 am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev 
* commit '10c111ed35a0282ddf5dda540c53e3831bc9b0ec':
  Show basic feature warning for default granted permissions
 2015-07-06 15:57:05 +00:00
Svet Ganov
e8b8d30a99 am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 
* commit 'cb8d2e21564ec749696dc3095524dafffa915c38':
  Improve request permission docs
 2015-07-06 15:57:01 +00:00
Svet Ganov
10c111ed35 Merge "Show basic feature warning for default granted permissions" into mnc-dev 2015-07-06 15:52:01 +00:00
Svet Ganov
cb8d2e2156 Merge "Improve request permission docs" into mnc-dev 2015-07-06 15:48:47 +00:00
George Mount
e61668cbe4 am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 
* commit '7fe86c4753e88058a7f1a1bf8d0302df9a64bd2e':
  Fix docs for ViewAnimationUtils.createCircularReveal
 2015-07-06 14:55:08 +00:00
George Mount
7fe86c4753 Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 2015-07-06 14:39:41 +00:00
Geoff Mendal
b2d9f043d8 am a5595900: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a559590043e32f670813e062f042f9e642297edf':
  Import translations. DO NOT MERGE
 2015-07-06 14:35:41 +00:00
Geoff Mendal
9deb70c4a2 am 210b38d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '210b38d767f38812f5866057b7d074e80d287ffa':
  Import translations. DO NOT MERGE
 2015-07-06 14:35:36 +00:00
Geoff Mendal
158c32388b am b0819373: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b0819373e08e27578d14799ede8f3a08119b60a0':
  Import translations. DO NOT MERGE
 2015-07-06 14:35:29 +00:00
Geoff Mendal
eb1dff4818 am 88b4a0ac: (-s ours) Import translations. DO NOT MERGE 
* commit '88b4a0ac56a2a006af2b8702c4c36590b287fcda':
  Import translations. DO NOT MERGE
 2015-07-06 14:35:24 +00:00
Geoff Mendal
a559590043 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:58:51 +00:00
Geoff Mendal
b7b84d012b Import translations. DO NOT MERGE 
Change-Id: I16a0ddf1bed80ef9b985cca96eec87e48d342982
Auto-generated-cl: translation import
 2015-07-06 08:56:00 -05:00
Geoff Mendal
210b38d767 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:51:50 +00:00
Geoff Mendal
5d935e8271 Import translations. DO NOT MERGE 
Change-Id: Ia90a9400d718b5ef61f55ed4d6c5eb9fe48d9667
Auto-generated-cl: translation import
 2015-07-06 08:50:33 -05:00