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

202401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
49cd4eac3b am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs 
* commit '15d1c1c95b3d8f25aad81dfdc2fc55028968242e':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
 2015-07-09 04:09:43 +00:00
Dirk Dougherty
e075053b08 am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs 
* commit '492123d5e672ddab8a6777981a62a24206622ae7':
  Doc change: minor updates to KIs and AFW behavior changes.
 2015-07-09 04:09:36 +00:00
David Friedman
15d1c1c95b am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs 
* commit '064f8b68f9e2404426ba37ce697b52dba6418810':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
 2015-07-09 03:56:07 +00:00
Dirk Dougherty
492123d5e6 am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs 
* commit '119683d12751ae657576d45448cd6f83478a0b55':
  Doc change: minor updates to KIs and AFW behavior changes.
 2015-07-09 03:56:01 +00:00
David Friedman
064f8b68f9 am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs 
* commit 'dde5e2635588b1949fbda31ef096b0ee838ae761':
  Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages.
 2015-07-09 03:39:05 +00:00
Dirk Dougherty
119683d127 am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs 
* commit '0ffd7158b2b6db8c3740c7bdaa55b39cede1c3fb':
  Doc change: minor updates to KIs and AFW behavior changes.
 2015-07-09 03:39:01 +00:00
Jim Miller
d92f643a72 am 748bc36f: Remove "final" qualifier from AuthenticationResult 
* commit '748bc36f2eebfdc67520c5025b48fefdfd8d7c01':
  Remove "final" qualifier from AuthenticationResult
 2015-07-09 03:34:37 +00:00
Robert Greenwalt
e9402b7e5b am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev 
* commit '348988c5704a5a6eb6aec093e295c2d9f00ee33c':
  Fix permissions on TelephonyManager
 2015-07-09 03:34:29 +00:00
David Friedman
dde5e26355 Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs 2015-07-09 03:21:47 +00:00
Jim Miller
748bc36f2e Remove "final" qualifier from AuthenticationResult 
This allows mock implementations to be created for testing
purposes.

Fixes bug 22362080

Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
 2015-07-09 03:19:31 +00:00
Robert Greenwalt
348988c570 Merge "Fix permissions on TelephonyManager" into mnc-dev 2015-07-09 03:19:26 +00:00
Dirk Dougherty
0ffd7158b2 Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs 2015-07-09 03:14:47 +00:00
Dirk Dougherty
ecf63e4d54 Doc change: minor updates to KIs and AFW behavior changes. 
Change-Id: If1af0f85593db48b241d81dcb6df9d4a5c703105
 2015-07-08 20:10:49 -07:00
Sanket Padawe
bae7a4d871 am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 
* commit '58295e71d293c131508d280f1373d94716348b2e':
  Add Null checks while processing pairing cancel intent
 2015-07-09 01:31:28 +00:00
Adam Lesinski
0d5c30d9ba am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 
* commit '7fb1655a891de275ab8a752294c42b9c13352af6':
  BatteryStats: Fail gracefully on corrupt battery stats
 2015-07-09 01:31:21 +00:00
Sanket Padawe
58295e71d2 Merge "Add Null checks while processing pairing cancel intent" into mnc-dev 2015-07-09 01:16:03 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Sanket Padawe
4d08a485db Add Null checks while processing pairing cancel intent 
Use case: Exception while handling pairing cancel
          Intent received
1. Initiate pairing from DUT to remote
2. Power off DUT after getting pairing popup

Root Cause:Crash observed in settings application

Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728
Fix: Fixed by adding Null check in PairingCancelHandler
 2015-07-09 01:02:03 +00:00
Robert Greenwalt
3f66835cc1 am de335a7d: Merge "Fix Permission Typo." into mnc-dev 
* commit 'de335a7dc4dcd6b1de8f4c455184f4c82d42612d':
  Fix Permission Typo.
 2015-07-09 00:48:09 +00:00
Mady Mellor
809cdd579a am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev 
* commit '84005b40499c0e9cc914afd69570c1f78c92b8d1':
  Use hint text to position handle / floating tool bar popups
 2015-07-09 00:43:35 +00:00
Svetoslav
d98e6dc2b0 am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 
* commit '6638c182635c6af036980ebdacc9c88411dcf583':
  Fix reset permissions on clear data and package uninstall.
 2015-07-09 00:43:29 +00:00
Svet Ganov
11be291675 am 9b84b5c5: Merge "Update storage group icon" into mnc-dev 
* commit '9b84b5c5131634ad81b161cb1806d4f5197e1712':
  Update storage group icon
 2015-07-09 00:37:33 +00:00
Jack Yu
99b0a02f93 am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev 
* commit '6b7a07848b21001a41aea1b6426ec2f75ea652ec':
  Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
 2015-07-09 00:37:27 +00:00
Amith Yamasani
ac3fb15fb8 am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 
* commit '705ba9606325df6575d171ee96811d215e69b4e8':
  Qualify the uid with the userId when granting permissions
 2015-07-09 00:37:22 +00:00
Robert Greenwalt
de335a7dc4 Merge "Fix Permission Typo." into mnc-dev 2015-07-09 00:36:32 +00:00
Adam Lesinski
9ae9cba020 BatteryStats: Fail gracefully on corrupt battery stats 
Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
 2015-07-08 17:35:42 -07:00
Mady Mellor
84005b4049 Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev 2015-07-09 00:06:13 +00:00
Svetoslav
6638c18263 Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 2015-07-08 23:58:01 +00:00
Robert Greenwalt
0f1ed304c1 Fix Permission Typo. 
There is no 'd' in privilege.  And there is no spell checking in Manifests.

bug:22358954
Change-Id: Ia122f51a81dc35760f277e23fe0f5a6d3d739457
 2015-07-08 16:57:45 -07:00
Svetoslav
4a5f4a2bc7 Fix reset permissions on clear data and package uninstall. 
If the user clears data for an app we reset the permission but
only the changes made by the user. We do not modify syste or
policy flags and also ensure the permission that were granted
by default are granted after the data wipe. This is the same
as starting with a clean slate.

If the package whose data is cleared is a part of a shared user
we resent to initial state only the permissions that the cleared
package contributed. Hence, if another package also declared the
permission as used we do not clear the permission state as it is
still in use.

When a package is deleted for a user but still present for another
user we reset its permissions to their inital state follwoing
above described strategy.

Lastly when a preinstalled package wtih an upgrade is diabled
(triggers upgrade uninstall) and this package is a part of a
shared user, we do not drop permission state (grants and flags)
for permissions used by the shadowed system package. This ensures
that we do not drop runtime permission state (such state is
default grants and user changes).i

bug:22248525

Change-Id: I3a3007476d2cb9f4ff824e1e137a6e1a4d04408b
 2015-07-08 16:52:42 -07:00
Svet Ganov
9b84b5c513 Merge "Update storage group icon" into mnc-dev 2015-07-08 23:51:21 +00:00
Jack Yu
6b7a07848b Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev 2015-07-08 23:46:36 +00:00
Wale Ogunwale
6a231f4891 am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit 'dad62b9f993b95bb9a0c20d29c69d35bd7531008':
  Finish already paused activity if it should be finished after pausing
 2015-07-08 23:45:48 +00:00
Amith Yamasani
705ba96063 Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 2015-07-08 23:44:55 +00:00
Wale Ogunwale
dad62b9f99 Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 2015-07-08 23:34:31 +00:00
Jeff Sharkey
ddcaa330bd am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev 
* commit '9f4c4ee66632e1355afa1218021ed728a99f7415':
  Fix crash looping SystemUI.
 2015-07-08 23:22:57 +00:00
Selim Cinek
7ac64f1d8d am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 
* commit '9201385f2e59d58bc52a5fbe5a3b666850dcae5f':
  Cleaned up the clipping logic for the dismiss motion.
 2015-07-08 23:22:51 +00:00
Jeff Sharkey
9f4c4ee666 Merge "Fix crash looping SystemUI." into mnc-dev 2015-07-08 23:14:11 +00:00
Jeff Sharkey
a80d264be6 Fix crash looping SystemUI. 
Bug: 22358954
Change-Id: Ie8539d7f866ae722edd071f6b20e8f8881d82434
 2015-07-08 16:11:55 -07:00
Selim Cinek
9201385f2e Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 2015-07-08 23:08:48 +00:00
Ian Pedowitz
a1fed110ef am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 
* commit '224f0369ca2ab6265379ce170c8779a7385a33f3':
  com.android.mms is no more, so removing from default_sms_application
 2015-07-08 23:07:16 +00:00
Sasha Levitskiy
319eacbff2 am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '12328ef422027f2f5f033ed65c8a09535f9ca81d':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:07:10 +00:00
Jim Miller
593fda725a am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev 
* commit 'e6fd76c23591c90cc8f8ae64d323e22abf491fdf':
  Don't use fingerId when creating names
 2015-07-08 23:07:03 +00:00
Vineeta Srivastava
a69dd6a246 am 99b8820f: Use fingerid 0 when checking failed attempts. 
* commit '99b8820fd7357f6287e65468b23751279562807b':
  Use fingerid 0 when checking failed attempts.
 2015-07-08 23:06:56 +00:00
Ian Pedowitz
224f0369ca Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 2015-07-08 23:01:19 +00:00
Ian Pedowitz
de8d3a53a8 com.android.mms is no more, so removing from default_sms_application 
Fixing a minor comment typo

Bug: 22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
 2015-07-08 23:00:22 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Jim Miller
e6fd76c235 Merge "Don't use fingerId when creating names" into mnc-dev 2015-07-08 22:58:23 +00:00
Amith Yamasani
6b53c16210 Qualify the uid with the userId when granting permissions 
Calls to remountUid() for secondary users was not using the
correct uid. This would prevent providing the required
storage permissions to default apps.

Discovered when investigating bug: 22356546

Change-Id: I98c8f6da724e46331c1c90b95969ca0871ef4fe9
 2015-07-08 15:57:24 -07:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface. 
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 15:38:07 -07:00