Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,038 Commits 3 Branches 0 Tags
8befd8be3714e361cbc20ad643e16757990b030d
Commit Graph

54220 Commits

Author SHA1 Message Date
Richard Coles
8befd8be37 am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev 
* commit 'fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8':
  Add WebView permission MIDI sysex
 2015-07-07 16:18:05 +00:00
Andrei Stingaceanu
47859abdb5 am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 
* commit 'bc687f96c74bd164f5d030cebe80d38274ca336c':
  Drag handles persist after lost focus in extracted mode
 2015-07-07 16:17:52 +00:00
Abodunrinwa Toki
fb84536d23 am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '4603bd34ce8a5557729e3912a081ec9f8c0d7ab5':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 16:17:00 +00:00
Richard Coles
fad2e49c42 Merge "Add WebView permission MIDI sysex" into mnc-dev 2015-07-07 10:15:17 +00:00
Andrei Stingaceanu
bc687f96c7 Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 2015-07-07 09:14:37 +00:00
Abodunrinwa Toki
4603bd34ce Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into mnc-dev 2015-07-07 03:59:46 +00:00
Adam Lesinski
e72e526c3d am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 
* commit 'fe45b29a1cce45b47f648cbff2b7d65890f1d638':
  BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
 2015-07-07 00:46:44 +00:00
Billy Lau
762bdd3cc9 am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit 'c81ecb6d2c6badb5ddbf19f7c90e350cf24322ee':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-07 00:32:26 +00:00
Adam Lesinski
fe45b29a1c Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 2015-07-07 00:32:24 +00:00
Aravind Akella
e2ab149a2e am adaa79d7: Merge "Remove flag mDataInjectionMode." into mnc-dev 
* commit 'adaa79d722dc1b410a3a8b083be5268cbb817ce4':
  Remove flag mDataInjectionMode.
 2015-07-07 00:32:19 +00:00
Winson Chung
ddcb64afae am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit '2924dc346654a22f72575eb8ae3ce2e714818bd2':
  Adding metrics to overview.
 2015-07-07 00:32:12 +00:00
Billy Lau
c81ecb6d2c Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-07 00:27:33 +00:00
Aravind Akella
adaa79d722 Merge "Remove flag mDataInjectionMode." into mnc-dev 2015-07-07 00:24:04 +00:00
Winson Chung
2924dc3466 Merge "Adding metrics to overview." into mnc-dev 2015-07-07 00:17:56 +00:00
Billy Lau
d6b404c72d Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission 
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
 2015-07-07 00:27:53 +01:00
Winson Chung
5c9f4b90bf Adding metrics to overview. 
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
 2015-07-06 15:52:21 -07:00
Adam Lesinski
61db88fc8b BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore 
Bug:22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
 2015-07-06 15:36:46 -07:00
Jorim Jaggi
716928465b am 28b4fc76: Merge "Don\'t prevent windows from drawing when they are just moving" into mnc-dev 
* commit '28b4fc76e2da7b93d9ba7ba75a7d0a512d9ff140':
  Don't prevent windows from drawing when they are just moving
 2015-07-06 22:31:55 +00:00
Aravind Akella
d4cc5ec230 Remove flag mDataInjectionMode. 
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
 2015-07-06 14:57:23 -07:00
Jorim Jaggi
c5af4f8421 Don't prevent windows from drawing when they are just moving 
Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
 2015-07-06 21:12:49 +00:00
Chris Craik
acb1582040 am 74fed612: Merge "Clearer message when failing to draw a SW layer" into mnc-dev 
* commit '74fed612336fad30c8a93a346160ee36c87bd843':
  Clearer message when failing to draw a SW layer
 2015-07-06 20:39:55 +00:00
Chris Craik
74fed61233 Merge "Clearer message when failing to draw a SW layer" into mnc-dev 2015-07-06 20:29:57 +00:00
Raph Levien
d226d0af42 am 441fc0fc: Merge "Fix problems with StaticLayout indentation" into mnc-dev 
* commit '441fc0fc68140368d5438a6eb5b896b4a9d6ad4e':
  Fix problems with StaticLayout indentation
 2015-07-06 18:20:54 +00:00
Adam Lesinski
635cb1eeb1 am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 
* commit '1a257545b2d1e8bd95393ee6637e70be7d230bc6':
  BatteryStats: Fix issue with method parameter order...
 2015-07-06 18:12:35 +00:00
Jeff Sharkey
69bebf13bd am 246d6984: Merge "Handle missing migration source volume." into mnc-dev 
* commit '246d69849951e4dbc0726a7faa58ecb71f7cf460':
  Handle missing migration source volume.
 2015-07-06 18:12:11 +00:00
Jeff Sharkey
56aabbea00 am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev 
* commit '38cae6c8bcb86236b21d69f852473351c0c1d82a':
  Reconcile private volumes when mounted.
 2015-07-06 18:12:04 +00:00
Raph Levien
441fc0fc68 Merge "Fix problems with StaticLayout indentation" into mnc-dev 2015-07-06 18:08:41 +00:00
Adam Lesinski
1a257545b2 Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 2015-07-06 18:00:33 +00:00
Eino-Ville Talvala
59fc17d9b3 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 17:59:22 +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
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00
George Mount
b0df3b27de am 20f71891: Merge "Fix Fade out during Activity Transition." into mnc-dev 
* commit '20f71891c4ae420398b96cc6a77f0c43316e6717':
  Fix Fade out during Activity Transition.
 2015-07-06 17:34:47 +00: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
Barnaby James
205379adb2 am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 
* commit 'c1e3ac321faea5717e1767bf2091334dde310eb7':
  Minor doc fixes for VoiceInteractor.
 2015-07-06 17:18:29 +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
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Raph Levien
28fe20bc82 am 401aa9d8: Merge "Clean up Hyphenator file reading" into mnc-dev 
* commit '401aa9d807bdc568f26cd40bfc96d26449267678':
  Clean up Hyphenator file reading
 2015-07-06 16:20:12 +00: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
2f27b12bfe 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:56:25 +00:00
Svet Ganov
a91acc9d02 am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 
* commit 'cb8d2e21564ec749696dc3095524dafffa915c38':
  Improve request permission docs
 2015-07-06 15:56:18 +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
84d9696212 am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 
* commit '7fe86c4753e88058a7f1a1bf8d0302df9a64bd2e':
  Fix docs for ViewAnimationUtils.createCircularReveal
 2015-07-06 14:54:44 +00:00
George Mount
7fe86c4753 Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 2015-07-06 14:39:41 +00:00
Jeff Sharkey
ef10ee0145 Handle missing migration source volume. 
Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I40645f8ccea05154e7cbacd188f6cba5f4dbbdc4
 2015-07-05 14:34:13 -07:00
Svet Ganov
40e95ba4a5 am 85be0c4e: Fix app ops aidl as it is also used from native. 
* commit '85be0c4e21ba6a2b74a8546403c6da03a343e5aa':
  Fix app ops aidl as it is also used from native.
 2015-07-05 16:49:27 +00:00
Jeff Sharkey
6dce4964b4 Reconcile private volumes when mounted. 
Many things can happen while a private volume is ejected, so we need
to reconcile newly mounted volumes against known state.

First, user IDs can be recycled, so we store the serial number in the
extended attributes of the /data/user/[id] directory inode.  Since a
serial number is always unique, we can quickly determine if a user
directory "10" really belongs to the current user "10".  When we
detect a mismatched serial number, we destroy all data belonging to
that user.  Gracefully handles upgrade case and assumes current serial
number is valid when none is defined.

Second, we destroy apps that we find no record of, either due to
uninstallation while the volume was unmounted, or reinstallation on
another volume.

When mounting a volume, ensure that data directories exist for all
current users.  Similarly, create data directories on all mounted
volumes when creating a user.  When forgetting a volume, gracefully
uninstall any apps that had been installed on that volume.

Bug: 20674082, 20275572
Change-Id: I4e3448837f7c03daf00d71681ebdc96e3d8b9cc9
 2015-07-04 17:08:42 -07:00