Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,424 Commits 3 Branches 0 Tags
ea796d7028aec09399a4e7c3661a18aaaedf523a
Commit Graph

46749 Commits

Author SHA1 Message Date
Paul Crowley
0d122e265c am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:02:37 +00:00
Paul Crowley
ba94fd5e6c am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '77e25331ca7ad1fb69fbe7fbec69179824e46e59':
  Add flag for wiping factory reset protection data.
 2014-11-25 21:18:30 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data. 
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
 2014-11-25 20:48:41 +00:00
Adam Lesinski
44a711ccac am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public
 2014-11-25 18:44:31 +00:00
Alan Viverette
11d33527e8 am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '44c09f2919d21296c0f020b954621c30d73eba20':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:44:20 +00:00
Ruben Brunk
7eb6e0e395 am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit 'c02cdf00e51b9a7ec7b9c74ba7eeb3711ec52213':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:43:51 +00:00
Alan Viverette
67c55be39a am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '0d05788fd06b24068c269bfa80dd96deafb00357':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:49:53 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
 2014-11-25 17:39:16 +00:00
Dianne Hackborn
9fafd0c711 am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '608439df383b40dc0f808e4992b369debaff29cd':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:36:52 +00:00
Jeff Brown
b56c4263c7 am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '8cac73097e3695d22e3529e77048d82f7fa0fb1c':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:10:26 +00:00
Sreeram Ramachandran
1cb0044ece am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '608ea322868385aaa46c20887795e72bf7068479':
  Delete unused/non-working code.
 2014-11-25 15:10:20 +00:00
Sreeram Ramachandran
19f47022e0 am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '4096a3107b070339ba06102a32a368f28a31f9a4':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:10:14 +00:00
Sreeram Ramachandran
ca7b070728 am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit '1d16570b374ffaea89a3e3d403146008d12e60b9':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:10:08 +00:00
Adrian Roos
9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")
 2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments
 2014-11-25 15:09:18 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
 2014-11-25 15:34:56 +01:00
Adam Lesinski
9f692b5202 am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9be305d146fb422a0e65e5284af2ce081cdc6a69':
  Make the Context service constant for UsageStats public
 2014-11-25 00:56:00 +00:00
Alan Viverette
44c09f2919 am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '27fbf67644bed5d0d590458ad89cee38d8fddeaa':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 00:55:49 +00:00
Adam Lesinski
9be305d146 Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 2014-11-25 00:51:10 +00:00
Alan Viverette
27fbf67644 Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 2014-11-25 00:50:50 +00:00
Ruben Brunk
c02cdf00e5 am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit '8791a1e81a5a07b10b2be05fc6f3d94a71139c96':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-24 23:16:03 +00:00
Ruben Brunk
8791a1e81a Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 2014-11-24 23:11:33 +00:00
Alan Viverette
d25eb9fbb9 Update documentation for DatePicker to reflect the new mode 
BUG: 18508605
Change-Id: I23d45bf1cd7783fa6f397c15f0ba6802e4069d6b
 2014-11-24 14:07:24 -08:00
Alan Viverette
0d05788fd0 am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '760cfb02de1e547b2823bf2b9621ef5b953cc5bd':
  Check for null drawable in theme-less getDrawable()
 2014-11-24 22:05:44 +00:00
Alan Viverette
760cfb02de Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 2014-11-24 21:57:51 +00:00
Adam Lesinski
aa6076701d Make the Context service constant for UsageStats public 
This was an oversight in L, where we did not make this
service constant public.

Change-Id: I42e38cb5ef8420cadc1a4a6705821189d911ccfe
 2014-11-24 13:53:57 -08:00
Jeff Sharkey
58b699c366 am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '636baa0d2451a531f8e83f5cdfc0d709989c4862':
  Introduce revision codes for split APKs.
 2014-11-24 20:20:10 +00:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs. 
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
 2014-11-24 12:13:11 -08:00
Alan Viverette
7e0aaae3db Check for null drawable in theme-less getDrawable() 
BUG: 18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
 2014-11-24 11:27:09 -08:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
Eino-Ville Talvala
bd9567e156 am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:05:40 +00:00
Dianne Hackborn
608439df38 am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '5bbb1af74a40f60d6609c2b1c580cb91ffb12c54':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-24 17:59:43 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Jeff Brown
8cac73097e am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b5686d55963e76c801ca0581a1012c5f4aa8d009':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:40:02 +00:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
 2014-11-24 17:34:32 +00:00
Sreeram Ramachandran
608ea32286 am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '6d0e8711d0612cfc9d9db2def57541076c0f7a40':
  Delete unused/non-working code.
 2014-11-24 17:28:14 +00:00
Sreeram Ramachandran
4096a3107b am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '45e27327178be9d5524cfcbdde9bb83502668e46':
  Allow VPNs to specify their underlying networks.
 2014-11-24 17:28:09 +00:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
1d16570b37 am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'aaea7e81141f4feb6cf5804b815567247b9c1f3a':
  Eliminate race conditions in UID-based network filtering.
 2014-11-24 17:23:52 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Narayan Kamath
97ee3f7ca6 resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic2826f3be8337e72a80978e4565e0884b9ceed70
 2014-11-24 16:32:06 +00:00
Narayan Kamath
43395d677b am 68e9af7b: am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT." 
* commit '68e9af7ba0b846768036f268d719f3d2a333ffca':
  Stop reading Settings.System.DATE_FORMAT.
 2014-11-24 16:19:04 +00:00
Narayan Kamath
32ed090f5a Merge "Stop using DATE_FORMAT from settings." 2014-11-24 16:14:33 +00:00
Narayan Kamath
f91f06a599 Stop reading Settings.System.DATE_FORMAT. 
Also, move over DateFormat.getInstance(SHORT) instead of
LocaleData.shortDateFormat4 (which forces 4 digit years).
Based on an analysis of git history, there seems to be no
real motiviation for using 4 digit years.

If anyone in the platform complains loudly, we could look at
using a skeleton pattern instead of just replacing 'y' with 'yy'.

If third party apps are affected, we could add a targetSdkversion
based check and revert to the old behaviour for older targetSdks.

bug: 18388178
bug: 18322220
Change-Id: Ieab2b41691958a2e668d382c5a6b3d9aaf741ed2
 2014-11-24 16:05:19 +00:00
Adrian Roos
520d20c1a8 am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '702d9e31b1bcacff975a2b8e0d04160bbd6811ed':
  Fix DPM.resetPassword("")
 2014-11-24 16:04:13 +00:00
Christoph Studer
30646d87f2 am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '671424951dcd2a0d1059c6d899a8649cbc8b5e26':
  Fix MediaStyle API comments
 2014-11-24 16:04:08 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
671424951d Merge "Fix MediaStyle API comments" into lmp-mr1-dev 2014-11-24 16:00:38 +00:00
Christoph Studer
e935fe918e Fix MediaStyle API comments 
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
 2014-11-24 14:18:06 +01:00