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

207951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xinhe
ece2b27ad1 am 8046c22d: am 9b8ddb09: am 822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev 
* commit '8046c22dfb1ac11ab5d12069d56d977d79e05557':
  Add API to turn OFF "best network selection" feature
 2015-07-17 23:53:56 +00:00
Chet Haase
3e75ef102e am fcba54eb: am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit 'fcba54eb88e8f4ef867d2205485e391d9855ef4a':
  Localize SimpleMonthView
 2015-07-17 23:41:11 +00:00
Jeff Sharkey
88c3301c30 am 2d9d5905: am 25945302: Merge "Persist version data on a per-volume basis." into mnc-dev 
* commit '2d9d59053fcb8504914f358a1417e67a94c0f8f1':
  Persist version data on a per-volume basis.
 2015-07-17 23:41:08 +00:00
xinhe
8046c22dfb am 9b8ddb09: am 822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev 
* commit '9b8ddb09042c72f0c2ebfbf1a2e967e3677fa680':
  Add API to turn OFF "best network selection" feature
 2015-07-17 23:41:03 +00:00
Adrian Roos
1f72739a0b am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev 
* commit '57ee4b87fee76d9f85d28a09e370a92b5839a8dd':
  Fix image wallpaper size
 2015-07-17 23:40:41 +00:00
Jeff Sharkey
80a3fbf408 am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev 
* commit 'c9eb398a1b0d7954b0d4f13fb46cae3042a99a75':
  Clear identity when killing media provider.
 2015-07-17 23:40:37 +00:00
Svetoslav Ganov
9fe9739548 am fd050586: am fa24a782: am 41ec3923: am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev 
* commit 'fd0505864f741f5de1bb7a1e2270bfe0f261029a':
  Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
 2015-07-17 23:40:31 +00:00
Chet Haase
fcba54eb88 am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit 'd3f327be2d1f8facd709895f2d05757351e8be07':
  Localize SimpleMonthView
 2015-07-17 23:31:44 +00:00
Jeff Sharkey
2d9d59053f am 25945302: Merge "Persist version data on a per-volume basis." into mnc-dev 
* commit '259453024c015da9d70d1ffadba09604aa1c786e':
  Persist version data on a per-volume basis.
 2015-07-17 23:31:39 +00:00
Adrian Roos
57ee4b87fe Merge "Fix image wallpaper size" into mnc-dev 2015-07-17 23:29:58 +00:00
Jeff Sharkey
c9eb398a1b Merge "Clear identity when killing media provider." into mnc-dev 2015-07-17 23:29:54 +00:00
Chet Haase
d3f327be2d Merge "Localize SimpleMonthView" into mnc-dev 2015-07-17 23:28:15 +00:00
xinhe
9b8ddb0904 am 822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev 
* commit '822f6141d4aca099e1dc37cda3bc861b2908df82':
  Add API to turn OFF "best network selection" feature
 2015-07-17 23:26:50 +00:00
Stephen Hines
0ee8f8ec2a am 1b5a4b10: am 0f5b7bc2: am 79a1bde2: Merge "Add a flag to the API to specify -O0 on the bcc command line." 
* commit '1b5a4b100a95d8db538e31ae7346c9a462cb8780':
  Add a flag to the API to specify -O0 on the bcc command line.
 2015-07-17 23:24:42 +00:00
Dianne Hackborn
16c268ee90 am c8457784: am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit 'c8457784df15e6c4361bce65628c56b9326977cf':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 23:24:35 +00:00
Svetoslav Ganov
fd0505864f am fa24a782: am 41ec3923: am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev 
* commit 'fa24a78239d2933408435c217d9657a66897da67':
  Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
 2015-07-17 23:24:29 +00:00
Jeff Sharkey
b3cf953345 Clear identity when killing media provider. 
Otherwise various shell "sm" commands fail because they don't hold
the right permissions.

Bug: 22564405
Change-Id: I88081e8a9b27ee43904d3ea6f745aba3af4e2150
 2015-07-17 16:21:43 -07:00
Jeff Sharkey
259453024c Merge "Persist version data on a per-volume basis." into mnc-dev 2015-07-17 23:20:37 +00:00
Jeff Sharkey
f80b52b08a Persist version data on a per-volume basis. 
Now that we support multiple adopted external storage devices, we
need to keep track of version data for each volume.  This means we
now correctly handle certificate upgrade edge cases, permission
regranting, and clearing of code caches on a per-volume basis.

Bug: 22298966
Change-Id: Ifb9940c197f6c058a3ecca728257f853ce0fd7f4
 2015-07-17 16:19:00 -07:00
Stephen Hines
1b5a4b100a am 0f5b7bc2: am 79a1bde2: Merge "Add a flag to the API to specify -O0 on the bcc command line." 
* commit '0f5b7bc2fe2ae554ab1f044eb5b10aab5f4812cb':
  Add a flag to the API to specify -O0 on the bcc command line.
 2015-07-17 23:15:13 +00:00
xinhe
822f6141d4 Merge "Add API to turn OFF "best network selection" feature" into mnc-dev 2015-07-17 23:13:07 +00:00
Dianne Hackborn
c8457784df am 9b7c2ee7: am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '9b7c2ee7d805e632d215a0fd7f4696b36bd510a7':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 23:07:19 +00:00
Svetoslav Ganov
fa24a78239 am 41ec3923: am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev 
* commit '41ec39230cd9c6b0d911f99854afc33dfc17e03d':
  Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
 2015-07-17 23:05:33 +00:00
Stephen Hines
0f5b7bc2fe am 79a1bde2: Merge "Add a flag to the API to specify -O0 on the bcc command line." 
* commit '79a1bde2e0f38507738743e490beb895dae7b03e':
  Add a flag to the API to specify -O0 on the bcc command line.
 2015-07-17 22:58:49 +00:00
Chris Craik
6ad690e16f Fix AssetAtlas usage in BitmapShaders 
bug:22521999

Change-Id: I60859748ceee19ebc89ec98845e550ea26e36ecd
 2015-07-17 15:53:24 -07:00
Dianne Hackborn
9b7c2ee7d8 am 35534fb4: am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '35534fb48047de9de0303319c5042f4ab0e38d24':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:48:12 +00:00
Svetoslav Ganov
41ec39230c am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev 
* commit 'fbc6f2cb6c5313ac246b8554764a719dd06582fc':
  Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
 2015-07-17 22:47:17 +00:00
Stephen Hines
79a1bde2e0 Merge "Add a flag to the API to specify -O0 on the bcc command line." 2015-07-17 22:45:16 +00:00
Svetoslav Ganov
fbc6f2cb6c Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev 2015-07-17 22:39:34 +00:00
Dianne Hackborn
35534fb480 am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit 'fb03aa36a4790ca0ff5e11a56903507089278390':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:33:34 +00:00
Dianne Hackborn
fb03aa36a4 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:17:58 +00:00
Svet Ganov
d4b30c82a8 am 825cdf83: am b6a8753c: am d28adb48: am 2d92575a: am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit '825cdf8305ca950a1f9da774728252ca3b702ef6':
  Grant default permissions to default apps despite user choices.
 2015-07-17 22:04:26 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +00:00
Svet Ganov
825cdf8305 am b6a8753c: am d28adb48: am 2d92575a: am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit 'b6a8753c25f6603ca04535facfca30f2e431ced5':
  Grant default permissions to default apps despite user choices.
 2015-07-17 21:49:39 +00:00
Svet Ganov
b6a8753c25 am d28adb48: am 2d92575a: am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit 'd28adb48291e8350b262498ba537990daa878f5b':
  Grant default permissions to default apps despite user choices.
 2015-07-17 21:37:47 +00:00
Xiaohui Chen
ece1044928 Merge "sys user split: update createUser method" 2015-07-17 21:33:14 +00:00
Svet Ganov
9bd7ccd21c am a47df5a0: am e29a61a0: am ae61307d: am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit 'a47df5a0aa6790e8c185dea630a62140de7c346f':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 21:29:38 +00:00
ztenghui
dbcea5f495 am 8054c55b: am b00f3e4f: am fcec0638: am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 
* commit '8054c55bc6a0b7b108ee58df728e7a2b2e646c17':
  Scaling (Animated)VectorDrawable inside ImageView
 2015-07-17 21:29:32 +00:00
Chet Haase
1ea4715cec Localize SimpleMonthView 
The days of the month were not being localized, resulting in
English numbers for non-English languages. Now we format the numbers
with the current locale.

Issue #22540629  [MRA14D][Arab][Token] numbers displayed in english

Change-Id: I2b17d55ba2d0aa47b5a28c8846c6cf9723ababb1
 2015-07-17 14:26:17 -07:00
Svet Ganov
d28adb4829 am 2d92575a: am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit '2d92575ad0dbbf3bfee4f013f4b78fac06c0ab50':
  Grant default permissions to default apps despite user choices.
 2015-07-17 21:22:39 +00:00
Svet Ganov
a47df5a0aa am e29a61a0: am ae61307d: am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit 'e29a61a0b9563cbafabb1f90ff9d9c6c5a0c7978':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 21:16:03 +00:00
ztenghui
8054c55bc6 am b00f3e4f: am fcec0638: am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 
* commit 'b00f3e4ff96fd31d46a1aa78bc20fefda4d5e305':
  Scaling (Animated)VectorDrawable inside ImageView
 2015-07-17 21:15:57 +00:00
Svet Ganov
2d92575ad0 am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit '5ff4383b466fc26e6696a7bbeb6df5eb7a3c8cc5':
  Grant default permissions to default apps despite user choices.
 2015-07-17 21:10:16 +00:00
Xiaohui Chen
2988187d7b Merge "sys user split: fix primary flag bug." 2015-07-17 21:09:29 +00:00
Svet Ganov
e29a61a0b9 am ae61307d: am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit 'ae61307d006d1204581b670e3c7f799ef48ba7f2':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 21:00:52 +00:00
ztenghui
b00f3e4ff9 am fcec0638: am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 
* commit 'fcec06384d895c538e25326246c128b3120f3905':
  Scaling (Animated)VectorDrawable inside ImageView
 2015-07-17 21:00:46 +00:00
Svet Ganov
5ff4383b46 Merge "Grant default permissions to default apps despite user choices." into mnc-dev 2015-07-17 20:58:13 +00:00
Svet Ganov
ae61307d00 am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit 'fa9a616de9664c4bd7212683facbd31dcd9c3bdd':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 20:46:01 +00:00
ztenghui
fcec06384d am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 
* commit '8b455841d9da1ac5ddf1b88e03c0c94613fd4046':
  Scaling (Animated)VectorDrawable inside ImageView
 2015-07-17 20:45:56 +00:00
Svet Ganov
4bb5187e63 Grant default permissions to default apps despite user choices. 
This implements the policy of granting default permissions to default
apps upon a selection despite past user permission choices. The act of
picking the app as the default one means the user expects it to work in
this capacity as SMS app, Phone app, Browser app.

bug:22062549

Change-Id: I5e427f2b939e85bb8bbfd311cc271b96857a7ce6
 2015-07-17 13:43:34 -07:00