Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,280 Commits 3 Branches 0 Tags
7ed3951b9bc2ca1c8b43e12db79e080222aa7db9
Commit Graph

46680 Commits

Author SHA1 Message Date
Amith Yamasani
7ed3951b9b am 50207f04: am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit '50207f043f8fd2e39173956c9b4ee52fe775e115':
  Use the correct method to check if device is encrypted
 2014-10-17 21:28:28 +00:00
Amith Yamasani
50207f043f am 3e732ab2: am e1970346: am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit '3e732ab2050507dbfde23ee0d050daae86d9d8bc':
  Use the correct method to check if device is encrypted
 2014-10-17 20:28:41 +00:00
Dianne Hackborn
f27e06b65b am eff986af: am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit 'eff986af3024c7348d4ff3810872421dfef79ac3':
  SDK only: hide the old L API version constant.
 2014-10-17 19:23:47 +00:00
Dianne Hackborn
eff986af30 am 9baa4506: am 3182987e: am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '9baa4506f1e7218d555d37a2057325c68492f080':
  SDK only: hide the old L API version constant.
 2014-10-17 19:16:37 +00:00
Amith Yamasani
e1970346a4 am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
  Use the correct method to check if device is encrypted
 2014-10-17 19:05:25 +00:00
Alan Viverette
d50efd6214 am 69441098: am 15d3a53b: am 721fc2ad: Fix build 
* commit '694410981fc55c84f740dea41b640e2ff7f5e474':
  Fix build
 2014-10-17 19:01:47 +00:00
Amith Yamasani
b5afeca3d9 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
 2014-10-17 19:00:36 +00:00
Amith Yamasani
a865bb5df8 Merge "Use the correct method to check if device is encrypted" into lmp-dev 2014-10-17 18:55:58 +00:00
Alan Viverette
694410981f am 15d3a53b: am 721fc2ad: Fix build 
* commit '15d3a53be5fa856ad85d066111d27c60c885f3b2':
  Fix build
 2014-10-17 18:55:05 +00:00
Dianne Hackborn
3182987eb8 am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit 'bab9b48efcc55ee247c428aa3f53725c25222166':
  SDK only: hide the old L API version constant.
 2014-10-17 18:53:37 +00:00
Amith Yamasani
cd410ba4e8 Use the correct method to check if device is encrypted 
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
 2014-10-17 11:43:57 -07:00
Alan Viverette
721fc2adf4 Fix build 
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
 2014-10-17 11:36:38 -07:00
Alan Viverette
247566e3e6 am ef8a1914: am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit 'ef8a19147e086c559e5e98e9ff340532385ab556':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:32:11 +00:00
Alan Viverette
ef8a19147e am 0087f225: am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit '0087f2253ac8cbb4868fd27d71afbad32a103a75':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:27:41 +00:00
Dianne Hackborn
6fb1a7f53b am aa02bce2: am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit 'aa02bce2f4acc57f2536cc41c2f0bf15498f6165':
  Add API level for MR1.
 2014-10-17 17:25:39 +00:00
Dianne Hackborn
aa02bce2f4 am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit '56ae044791aa9a800292eb0f6c3852ede91f17c2':
  Add API level for MR1.
 2014-10-17 17:19:55 +00:00
Alan Viverette
2f68a204b2 Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 2014-10-17 17:18:36 +00:00
Dianne Hackborn
bab9b48efc am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev 
* commit '52476989b8afc0e96c2218625031ed550b12c79b':
  SDK only: hide the old L API version constant.
 2014-10-17 17:15:08 +00:00
Dianne Hackborn
686a41ef2b Merge "Add API level for MR1." into lmp-mr1-dev 2014-10-17 17:12:01 +00:00
Neil Fuller
a762f687eb am 3b96bfb1: am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '3b96bfb1034433fde57239de036eaa96be107f04':
  Removing some more FloatMath references
 2014-10-17 15:04:34 +00:00
Neil Fuller
3b96bfb103 am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
 2014-10-17 14:59:48 +00:00
Neil Fuller
9b0109eb05 am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
 2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623 Merge "Removing some more FloatMath references" 2014-10-17 14:48:17 +00:00
Dianne Hackborn
3b6968876f Add API level for MR1. 
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
 2014-10-16 18:14:12 -07:00
Alan Viverette
6658034c91 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536 automerge: e0fceba 
automerge: 777949c

* commit '777949c64d335fd56eef80eadc2b09dcb5e009fa':
  Update AM/PM selectors for clock face TimePicker
 2014-10-17 00:51:15 +00:00
Dianne Hackborn
d3511d4be1 SDK only: hide the old L API version constant. 
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
 2014-10-16 17:49:45 -07:00
Alan Viverette
777949c64d Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536 
automerge: e0fceba

* commit 'e0fceba162a3bd583fa8ed16d3d69920cadd4a4c':
  Update AM/PM selectors for clock face TimePicker
 2014-10-17 00:15:02 +00:00
Alan Viverette
0db6536190 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev 2014-10-16 23:48:38 +00:00
Prerepa Viswanadham
41ae22f5d0 am 1724f211: am 2e8beaed: am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '1724f211608f13883d76c62d5c4d851c27781ae3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:54:56 +00:00
Prerepa Viswanadham
1724f21160 am 2e8beaed: am 06819409: am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '2e8beaed54aa897eb4b9435ab11d269f15266f4a':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:45:28 +00:00
Prerepa Viswanadham
06819409c6 am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 18:35:33 +00:00
Brian Carlstrom
c12099678f am 70111a42: am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '70111a429d6da51ffd1790eb767086acada2dabe':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 18:12:59 +00:00
Brian Carlstrom
70111a429d am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'fe6cde379a7b086032877917c0ee0e64bf7e9e57':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 18:05:13 +00:00
Brian Carlstrom
6580c273a5 am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 17:45:54 +00:00
Prerepa Viswanadham
56302744c4 am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser() 
* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
  Update javadoc comments for getBluetoothLeAdvertiser()
 2014-10-16 16:11:26 +00:00
Prerepa Viswanadham
248edc3e96 Update javadoc comments for getBluetoothLeAdvertiser() 
To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities

bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
 2014-10-16 16:06:44 +00:00
Adrian Roos
de2dc4e115 am 0f08243d: am c344cdc1: am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit '0f08243da6f3f58f18e7a0f3c1395eb2791d4d43':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 15:06:35 +00:00
Adrian Roos
0f08243da6 am c344cdc1: am ccb7a9af: Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 
* commit 'c344cdc1bbe6dca60326b6d4f10a67a923c84847':
  Prevent ChooserActivity from taking over the system bars
 2014-10-16 15:01:36 +00:00
Adrian Roos
ccb7a9af27 Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev 2014-10-16 14:54:19 +00:00
George Mount
e084c1f1e5 am 56789daa: am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit '56789daadf666a24c4644cd3820561566582109f':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:35:30 +00:00
George Mount
56789daadf am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 
* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
  Use empty snapshots list when there are no shared elements.
 2014-10-16 14:29:51 +00:00
George Mount
ea6f0ae86d Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev 2014-10-16 14:21:43 +00:00
Neil Fuller
d44e9f9ed7 am 06965cfd: am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit '06965cfd12854d8b1f783a847d4b979100da4551':
  Replacing FloatMath native implementation with calls to Math
 2014-10-16 09:41:00 +00:00
Neil Fuller
06965cfd12 am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit '8a3785cafec4b47fe8d61614b04a0e193d616428':
  Replacing FloatMath native implementation with calls to Math
 2014-10-16 09:35:43 +00:00
Neil Fuller
8a3785cafe am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to Math" 
* commit 'fd2d41b742339d278f4a66f78a7c161108985ed8':
  Replacing FloatMath native implementation with calls to Math
 2014-10-16 09:24:18 +00:00
Neil Fuller
fd2d41b742 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-16 08:16:24 +00:00
Alan Viverette
d0d6775ef6 am bba4bcf0: am ca66be9e: am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 
* commit 'bba4bcf0b15f3675d07373919eb23027a94949c9':
  Set content description on CalendarView day labels
 2014-10-16 02:48:18 +00:00
Alan Viverette
bba4bcf0b1 am ca66be9e: am b4a29247: Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 
* commit 'ca66be9e0ef691a4c8ccd5c7da7e07e618e9bb85':
  Set content description on CalendarView day labels
 2014-10-16 02:37:32 +00:00
Brian Carlstrom
d2b824887f am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 
* commit '20de619d66a594fd9e6e76a3a2cb79422aef577c':
  Set threads' contextClassLoader during LoadedApk.makeApplication.
 2014-10-16 01:56:00 +00:00
Alan Viverette
a9a8ba2c6e am e3171d27: am c07241ca: am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev 
* commit 'e3171d276272a8ae098a50cbcac691d3c8b62dab':
  Document Toolbar's vertical alignment strategy
 2014-10-16 01:19:37 +00:00