Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,340 Commits 3 Branches 0 Tags
2706cb804a4e2d52b671a560f65108cf2ebbcd6d
Commit Graph

64470 Commits

Author SHA1 Message Date
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
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
Elliott Hughes
1f7b3b5c7d am 1fae0991: am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit '1fae0991326fbaac8a11ae972f0da2bbc50be429':
  We have POSIX clocks.
 2014-11-25 23:35:47 +00:00
Elliott Hughes
1fae099132 am f67cc149: am 2657717f: Merge "We have POSIX clocks." 
* commit 'f67cc149982cefdcf9f8697c9966c710f6512d23':
  We have POSIX clocks.
 2014-11-25 23:29:14 +00:00
Elliott Hughes
42c569224a We have POSIX clocks. 
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
 2014-11-25 15:11:59 -08: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
77e25331ca Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 2014-11-25 21:13: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
chh
1d5f99b973 am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit 'd7572b84efdb694618fca550a3fb5ccc4a7ccd5f':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:57:42 +00:00
chh
d7572b84ef am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters" 
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
  Remove unused variables and functions, don't warn about unused parameters
 2014-11-25 19:04:05 +00:00
Andres Morales
8f70a2558b am ffc71028: am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit 'ffc710281c38aba9546d200a25d6b19b0f85470a':
  Define permission for system apps to query size of block
 2014-11-25 18:51:42 +00:00
Bo Liu
2b5edf651a am 88309159: am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '88309159a53ceb4f34fe01056521e4b84e848ef7':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:51:37 +00:00
Alan Viverette
c0cdc00df2 am 3d0b7cdb: am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '3d0b7cdb661d29091ee789e5ca5e2e762edb0864':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:51:11 +00:00
Alan Viverette
37edd7d673 am bf7ef378: am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit 'bf7ef378980a7d5b9b231d6e75a70923e83eed8c':
  Update IME selection dialog layout for Material
 2014-11-25 18:51:06 +00:00
Adam Lesinski
e1d149d5da am 44a711cc: am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '44a711ccac480aef4e8518284b8a0320e227f2df':
  Make the Context service constant for UsageStats public
 2014-11-25 18:50:57 +00:00
Alan Viverette
65be2b5037 am 11d33527: am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '11d33527e8715f2f6b7317a6424bcb2001778d44':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:50:48 +00:00
Ruben Brunk
07053cb921 am 7eb6e0e3: am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit '7eb6e0e3954bce374bc9ab7362005063174090b1':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:50:38 +00:00
Erik Kline
08866fcfa5 Merge "Map TYPE_VPN integer to "VPN" string." 2014-11-25 18:46:37 +00:00
Andres Morales
ffc710281c am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit '83f4847f7b842fafec74fad85878e36b19dfef9f':
  Define permission for system apps to query size of block
 2014-11-25 18:46:15 +00:00
Bo Liu
88309159a5 am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '3813430367591efcf925b2baebc50a99a7666644':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 18:46:04 +00:00
Alan Viverette
3d0b7cdb66 am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '2bae3789da18676cabf2e09e49c519fa96184a81':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:44:48 +00:00
Alan Viverette
bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material
 2014-11-25 18:44:42 +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
d8eb415d61 am 67c55be3: am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '67c55be39a76fb17cff79d926914a37fe56d452d':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:55:52 +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
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00
Amit Mahajan
1d9d52c180 am 0e6d836e: am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit '0e6d836efa56d49638d9a830258130cc4fc6f626':
  Set network selection to automatic when in Global mode
 2014-11-25 17:48:41 +00:00
Dianne Hackborn
475615b583 am 14dd6ebf: am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '14dd6ebff64af8d991680b7dda2286cd1d578c06':
  Final resource IDs.
 2014-11-25 17:48:30 +00:00
Dianne Hackborn
039777e792 am 9fafd0c7: am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '9fafd0c7111f0d0df431f6c0a4f4f5afcdea7b81':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:48:24 +00:00
Andres Morales
83f4847f7b am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit '59093d925decaf6ddf2e952de25e3cdd1b492d81':
  Define permission for system apps to query size of block
 2014-11-25 17:41:30 +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
Amit Mahajan
0e6d836efa am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit 'ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
  Set network selection to automatic when in Global mode
 2014-11-25 17:37:37 +00:00
Dianne Hackborn
14dd6ebff6 am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit 'd65cb22872b5dbfb5937d66191b60be22b63fd21':
  Final resource IDs.
 2014-11-25 17:36:58 +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
Andres Morales
59093d925d Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 2014-11-25 17:35:21 +00:00
Bo Liu
3813430367 am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '84be180e97f920a9400789368a6bc54c5a9b90d8':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 16:59:27 +00:00
Bo Liu
84be180e97 Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 2014-11-25 16:56:07 +00:00
Andres Morales
6b0c7acd7f Define permission for system apps to query size of block 
Allows ManagedProvisioning to determine whether there's a
challenge and thus whether to disable NFC provisioning.

Other implementation option: new hidden boolean API method.
Can't think of benefit of new API method "isBlockInUse", other
than doesn't leak PDB size and is more explicitly tied to the
use case. Open to either impl if anyone has opinions on the matter.

Bug: 18508767
Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
 2014-11-25 15:55:28 +00:00
Jeff Brown
3a1c4db53e am b56c4263: am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b56c4263c73224ea7c0c0580729a5700c1db87d1':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:16:14 +00:00
Sreeram Ramachandran
10fd39001c am 1cb0044e: am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '1cb0044ece9e3db6ca631daff7d225ce60b67f40':
  Delete unused/non-working code.
 2014-11-25 15:16:10 +00:00
Sreeram Ramachandran
b3e20899fe am 19f47022: am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '19f47022e0c89a11ef03c158d19fa294168da360':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:16:05 +00:00
Sreeram Ramachandran
053ebdb4ea am ca7b0707: am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'ca7b07072849fa2e4bf4e074ce1366eb7138befc':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:16:00 +00:00
Adrian Roos
e1d84dd914 am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '9a4d0257beadf53c706afbcb4abc76c17a44ff00':
  Fix DPM.resetPassword("")
 2014-11-25 15:15:35 +00:00
Christoph Studer
18032a083a am fe6d4f09: am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit 'fe6d4f094d2441314bb31fec10b520f80aeb481e':
  Fix MediaStyle API comments
 2014-11-25 15:15:31 +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