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

196638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Esteban Talavera
5a81b61e87 Merge "Notify the profile when cloned settings are changed." into mnc-dev 2015-07-07 09:27:27 +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
Ian Pedowitz
5bc88b9f46 Merge "Final resource IDs." into mnc-dev 2015-07-07 06:13:14 +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
Jan Nordqvist
2047929ef7 Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev 2015-07-07 01:41:17 +00:00
Selim Cinek
4d696690e6 Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev 2015-07-07 01:37:07 +00:00
Zhijun He
1f52fce6b9 Merge "ImageUtils: fix image copy issue" into mnc-dev 2015-07-07 01:07:17 +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
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
Selim Cinek
d06c41c970 Fixed a bug where redacted notifications had the wrong height 
When redacted notifications were added on the lockscreen,
it's size might have been incorrect sometimes.

Bug: 22235304
Change-Id: I30f665bc8e725cdd40a20051e995b10e77f96918
 2015-07-06 16:59:27 -07: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
Jean-Michel Trivi
760b1409bc Merge "Ringtone: add support for volume control and looping" into mnc-dev 2015-07-06 23:07:26 +00: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
Dianne Hackborn
5c8498db21 Merge "Add easy way to get device idle whitelist." into mnc-dev 2015-07-06 22:24:51 +00:00
Dianne Hackborn
1b13968707 Add easy way to get device idle whitelist. 
Change-Id: I28b0df69e7fb16b5d7542b1eae626bbfdd9a4c1c
 2015-07-06 15:13:37 -07:00
Jorim Jaggi
28b4fc76e2 Merge "Don't prevent windows from drawing when they are just moving" into mnc-dev 2015-07-06 22:07:34 +00:00
Aravind Akella
d4cc5ec230 Remove flag mDataInjectionMode. 
Change-Id: Ia7cbe8942168ac57abbb92c1a1ed51c568be94fe
 2015-07-06 14:57:23 -07:00
Alex Klyubin
b9e13a25f3 Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev 2015-07-06 21:50:43 +00:00
David Friedman
18b763bb1a am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 
* commit '076d4f40d849d1d1e628fa6b210e690020d04956':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
 2015-07-06 21:41:05 +00:00
Casey Ho
becddea63e Merge "Unhide signal strength constants used by getLevel." into mnc-dev 2015-07-06 21:39:31 +00:00
David Friedman
076d4f40d8 am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 
* commit '7bd9b634c42b500466cf416566d27da229d6ca1c':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
 2015-07-06 21:27:05 +00:00
David Friedman
7bd9b634c4 Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 2015-07-06 21:15:07 +00:00
David Friedman
f9fc53bb6f am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303. 
* commit '77b6971b4699bd94c9a4b044108f264f1ddfe31f':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
 2015-07-06 21:13:19 +00: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
David Friedman
77b6971b46 am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303. 
* commit 'c66c7622eadb04c1ca258725ae7125626824c324':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
 2015-07-06 20:56:51 +00:00
Zhijun He
bc0b636679 ImageUtils: fix image copy issue 
Source and destination images may have different alignment requirements,
therefore may have different strides. Copy row by row for such case.

Bug: 21934891
Change-Id: Id53f45f1429d233032fa608f7ab9e2774e88c13b
 2015-07-06 13:48:23 -07: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
David Friedman
f3a910b88d am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 
* commit '5977c4879b166eb1b5c0d6a7a361dde515e1d502':
  docs: M Preview 2 - release notes
 2015-07-06 20:09:11 +00:00
David Friedman
c66c7622ea Docs: Clarification of language and typo fix for work merged from CL 716303. 
Change-Id: I04f062696926b00ccfbd45fef368061dd968efbb
 2015-07-06 13:04:16 -07:00
David Friedman
5977c4879b am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 
* commit '07661e3b73cee9720d79d0d09f7a60104ce4cabc':
  docs: M Preview 2 - release notes
 2015-07-06 19:53:11 +00:00
David Friedman
07661e3b73 Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 2015-07-06 19:38:09 +00:00
Jim Miller
79d9219c9f Merge "Only allow fingerprint auth for the current user" into mnc-dev 2015-07-06 19:18:05 +00:00
David Friedman
13c2529009 am e7fb3318: am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 
* commit 'e7fb33180d689bbdddae03ab0afe730e4d312f45':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
 2015-07-06 18:43:37 +00:00
Andrew Solovay
8f8ad8bb57 am b9e4e0d0: am afea7a99: docs: Updating permissions preview for Preview 2. 
* commit 'b9e4e0d0f13ba40e95590f42c351af9b1dba0c5b':
  docs: Updating permissions preview for Preview 2.
 2015-07-06 18:43:31 +00:00
Dianne Hackborn
61ba419429 Final resource IDs. 
Change-Id: I6200a013375f1b3e196b6426a6c925f4e9dfe4b1
 2015-07-06 18:43:13 +00:00
Jim Miller
cb7d9e9332 Only allow fingerprint auth for the current user 
This prevents fingerprint access from activities
for a user that isn't the current user.

Fixes bug 20223481

Change-Id: I360f90972fe63f5066f701a3efda355a7cb11338
 2015-07-06 11:38:52 -07:00
David Friedman
e7fb33180d am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 
* commit 'b50a279fb68aace181787780187c9d3485c84f50':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
 2015-07-06 18:29:11 +00:00
Andrew Solovay
b9e4e0d0f1 am afea7a99: docs: Updating permissions preview for Preview 2. 
* commit 'afea7a9982de194893cf1a789bc2625d192727c4':
  docs: Updating permissions preview for Preview 2.
 2015-07-06 18:29:06 +00:00
Alex Klyubin
b6e628644a Avoid IllegalStateException when generating/importing keys. 
This avoids IllegalStateException when generating/importing keys which
require user authentication when the system is not configured to
generate/import such keys (e.g., secure lock screen not set up).

The documentation states that before generating/importing such keys
apps should check (using public API) whether the system is in a
suitable state. However, some apps are not doing that and instead
catching the IllegalStateException thrown during key
generation/import. This is a bad practice because this exception is an
undocumented implementation detail and should thus not be depended
upon.

This CL addresses this issue as follows:
1. Key(Pair)Generator.init now throws a checked
   InvalidAlgorithmParameterException when the system is in a wrong
   state. Because in most uses of Key(Pair)Generator .init is
   immediately followed by .generate, this prevents .generate from
   encountering this state and does so using a checked exception
   which is part of public API.
2. Key import rethrows the IllegalStateException as a checked
   KeyStoreException which is meant to be thrown if the key cannot be
   imported for any reason. Key(Pair)Generator.generate unfortunately
   cannot throw any checked exceptions and thus has to continue
   throwing unchecked exceptions.

Bug: 22262809
Change-Id: Ic0f7b7a90e0ba63df9139c79b80a8649d2645d2a
 2015-07-06 11:27:16 -07:00
David Friedman
b50a279fb6 Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 2015-07-06 18:20:38 +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
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