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

190452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
9886be4225 Merge "Import translations. DO NOT MERGE" 2015-04-29 12:59:34 +00:00
Geoff Mendal
aa6bb66159 Import translations. DO NOT MERGE 
Change-Id: If87615207a55eac714ecd7895f2a73ee120d6cbe
Auto-generated-cl: translation import
 2015-04-29 05:58:27 -07:00
Geoff Mendal
15ee2a6df8 Merge "Import translations. DO NOT MERGE" 2015-04-29 12:53:51 +00:00
Geoff Mendal
6db4699a62 Import translations. DO NOT MERGE 
Change-Id: I3ceb55bbf8af3bae4922724c7afb0f503f806349
Auto-generated-cl: translation import
 2015-04-29 07:50:55 -05:00
Geoff Mendal
b3530295b6 Import translations. DO NOT MERGE 
Change-Id: I43378ea885cdb018cd8b8cda5b8be304817e8ee8
Auto-generated-cl: translation import
 2015-04-29 05:18:45 -07:00
Nicolas Prevot
1c4a44e577 Do not return cross-profile intent results to a non-enabled user. 
In PackageManagerService.queryIntentActivities, do not return
ResolveInfos targeting a user which is not enabled.

BUG:19578138
Change-Id: Id4e730ca8671c26f8cf077bc9c66b3dbd37be482
 2015-04-29 11:10:19 +00:00
Benjamin Franz
431659a60c am da8f7a17: am af275e15: am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev 
* commit 'da8f7a176c096dd79356286c90bc0a3147609981':
  Add status bar flag to disable quick settings
 2015-04-29 09:46:42 +00:00
Benjamin Franz
da8f7a176c am af275e15: am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev 
* commit 'af275e157abb8b3add62e5bf1827519820cdf238':
  Add status bar flag to disable quick settings
 2015-04-29 09:35:38 +00:00
Benjamin Franz
af275e157a am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev 
* commit 'c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
  Add status bar flag to disable quick settings
 2015-04-29 09:15:20 +00:00
Benjamin Franz
c4aa3c781a Merge "Add status bar flag to disable quick settings" into mnc-dev 2015-04-29 08:36:00 +00:00
Dongwon Kang
13d43ff02a am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 
* commit 'd3fad391e1ccc79fbd0b9330f2aab60bf5b2075b':
  TIF: throw an exception if an operation takes too long.
 2015-04-29 06:04:43 +00:00
Jeff Sharkey
d70088d811 am 572b1078: am 15c7f90c: am b42d6946: Method to wipe all adoptable disks. 
* commit '572b1078962437d7495f395bda0bc8125c833465':
  Method to wipe all adoptable disks.
 2015-04-29 06:04:37 +00:00
Jeff Sharkey
9f1a1bd82d am a149ba02: am aa4e35eb: am b36586a7: Split some VolumeInfo state into VolumeRecord. 
* commit 'a149ba0255c5983b4e0b23b120b388b9236583e9':
  Split some VolumeInfo state into VolumeRecord.
 2015-04-29 05:52:54 +00:00
Dongwon Kang
d3fad391e1 am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 
* commit '633a45a0d4e095ae81fc2c3e882c23a6513bbaee':
  TIF: throw an exception if an operation takes too long.
 2015-04-29 05:52:39 +00:00
Jeff Sharkey
572b107896 am 15c7f90c: am b42d6946: Method to wipe all adoptable disks. 
* commit '15c7f90c8d84ce992659d0ec29bb0e60f1b603d1':
  Method to wipe all adoptable disks.
 2015-04-29 05:52:35 +00:00
Dongwon Kang
633a45a0d4 am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 
* commit '25466e0a8f3e0f7f1e758642519f3aa8643f6f26':
  TIF: throw an exception if an operation takes too long.
 2015-04-29 05:41:35 +00:00
Jeff Sharkey
a149ba0255 am aa4e35eb: am b36586a7: Split some VolumeInfo state into VolumeRecord. 
* commit 'aa4e35eb6540806958cb37c5c564c5d20dd7a978':
  Split some VolumeInfo state into VolumeRecord.
 2015-04-29 05:41:33 +00:00
Jeff Sharkey
15c7f90c8d am b42d6946: Method to wipe all adoptable disks. 
* commit 'b42d694691e73d094df616fe78627ada7e1239ef':
  Method to wipe all adoptable disks.
 2015-04-29 05:41:30 +00:00
Shawn Willden
72958047fb am b672afaa: am adbbba9f: Merge "Add missing error codes from keymaster_defs.h." 
* commit 'b672afaa8c4e1bd7681115eb56914b61a549b6db':
  Add missing error codes from keymaster_defs.h.
 2015-04-29 05:34:50 +00:00
Alan Viverette
2ceea2160e am 9c36ee9b: am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory" 
* commit '9c36ee9b4f42909c1a425322e4e2d3e86dd6edc5':
  Context leaks in EditText causes out of memory
 2015-04-29 05:34:45 +00:00
Dongwon Kang
25466e0a8f Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 2015-04-29 05:34:26 +00:00
Dongwon Kang
21add3ecc9 TIF: throw an exception if an operation takes too long. 
Bug: 19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
 2015-04-29 14:33:24 +09:00
Jeff Sharkey
aa4e35eb65 am b36586a7: Split some VolumeInfo state into VolumeRecord. 
* commit 'b36586a7c9b7718f33961406537e27bbd9b16211':
  Split some VolumeInfo state into VolumeRecord.
 2015-04-29 05:29:50 +00:00
Jeff Sharkey
b42d694691 Method to wipe all adoptable disks. 
Will be used by various classes doing factory reset.

Bug: 9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51
 2015-04-28 22:25:26 -07:00
Jeff Sharkey
b36586a7c9 Split some VolumeInfo state into VolumeRecord. 
VolumeRecord is a historical record of a volume that we've seen in
the past.  It's now surfaced outside the framework for SystemUI to
drive the notifications that bug users to reinsert missing private
volumes.

Show progress notifications for both storage and package movement
operations.  Notify when an empty disk is inserted (no usable volumes)
which launches into the normal format flow.

Add API to forget volumes.

Bug: 20275424, 20275424
Change-Id: I75602c17fdcd4d1f1f62324e1a08c4a33093eefa
 2015-04-28 22:02:36 -07:00
Shawn Willden
b672afaa8c am adbbba9f: Merge "Add missing error codes from keymaster_defs.h." 
* commit 'adbbba9f1dc364e4d3911562fdb8f2e666922e2f':
  Add missing error codes from keymaster_defs.h.
 2015-04-29 04:54:33 +00:00
Alan Viverette
9c36ee9b4f am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory" 
* commit '2ddfcc4ade5d6db69808a340ae54280872559ec1':
  Context leaks in EditText causes out of memory
 2015-04-29 04:54:28 +00:00
David Friedman
8d5f363874 am cde209f2: am c69018da: am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit 'cde209f2b6e0d8c0193e27ae7dd7192e37967a40':
 2015-04-29 04:48:57 +00:00
David Friedman
cde209f2b6 am c69018da: am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit 'c69018daff3563d5016010ca17820e5e774c3b86':
 2015-04-29 04:33:11 +00:00
David Friedman
66fb41d2fa am a43b7e61: am 1775e0b2: am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit 'a43b7e61773334a158d884522842a1e29327668d':
  Localized Android landing pages Bug: 19124242
 2015-04-29 04:32:38 +00:00
Shawn Willden
adbbba9f1d Merge "Add missing error codes from keymaster_defs.h." 2015-04-29 04:30:18 +00:00
David Friedman
c69018daff am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '30565ed225e6d91c37b438a64f715725b1663058':
 2015-04-29 04:20:41 +00:00
Alan Viverette
2ddfcc4ade Merge "Context leaks in EditText causes out of memory" 2015-04-29 04:19:40 +00:00
David Friedman
a43b7e6177 am 1775e0b2: am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '1775e0b295b463996c4617210b9bfdfc4833c12b':
  Localized Android landing pages Bug: 19124242
 2015-04-29 04:18:15 +00:00
David Friedman
1775e0b295 am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '16bf47e8d6c9b9b4a9618fef998d6c9808cb17cb':
  Localized Android landing pages Bug: 19124242
 2015-04-29 04:08:29 +00:00
David Friedman
30565ed225 am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit 'a39e4d3716a10e84acbfc0813745ee4303f1edb2':
 2015-04-29 04:05:47 +00:00
David Friedman
16bf47e8d6 am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '3d983deace20df9437bc9efebc67550f3904eee3':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:51:39 +00:00
David Friedman
a39e4d3716 am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '77ad81b5301bfbf1691bdad203dd70ce68ce40b3':
 2015-04-29 03:48:52 +00:00
David Friedman
77ad81b530 am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit 'ff1bfac68b977f577d537172d87daa5c816be3b7':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:25:38 +00:00
David Friedman
3d983deace am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '21a9fa471bcc57196a19e40ca29dbaa97233244c':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:25:15 +00:00
David Friedman
ff1bfac68b am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit 'c637af9eee48334e6d8d65428734c8928e9bac55':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:13:59 +00:00
David Friedman
21a9fa471b am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:01:57 +00:00
David Friedman
c637af9eee am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 
* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
  Localized Android landing pages Bug: 19124242
 2015-04-29 03:01:10 +00:00
Jae Seo
7e18baa354 Merge "TIF: Put comments for the newly added US and Canadian rating strings" 2015-04-29 02:57:27 +00:00
David Friedman
75f071df44 Merge "Localized Android landing pages Bug: 19124242" into lmp-docs 2015-04-29 02:49:24 +00:00
Alex Klyubin
ceb190edbc am a65101cd: am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev 
* commit 'a65101cd49247f792ae05bc31458c73bbcacf6c0':
  Align AndroidKeyStore API with user auth API.
 2015-04-29 02:25:54 +00:00
Jeff Brown
c12fc2ae10 am 4b5a7b71: am d5a9ff0e: am b957a742: Merge changes from topic \'brightness\' into mnc-dev 
* commit '4b5a7b718ed2eec998cb14d36c7d6c84236c2fe6':
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
 2015-04-29 02:25:49 +00:00
Fabrice Di Meglio
ce9fccc7a6 am e5d4422b: am c55ab042: am 46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev 
* commit 'e5d4422be51a42c96636ada1807e2422fac6fbd1':
  Use Default Browser App for IntentResolution when needed
 2015-04-29 02:25:43 +00:00
Christopher Tate
4a0ea4233f am 890b2a59: am a01fade4: am d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev 
* commit '890b2a59e59e5c5fdee6ca762c887c39613349b6':
  Don't ostensibly back off fstrim but then do it anyway
 2015-04-29 02:25:37 +00:00
Amith Yamasani
1476b14086 am 5b9a5fef: am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev 
* commit '5b9a5fef6d9d74a09470042b9690d63830417b28':
  Permissions control via profile/device owner admin
 2015-04-29 02:25:28 +00:00