Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,408 Commits 3 Branches 0 Tags
50207f043f8fd2e39173956c9b4ee52fe775e115
Commit Graph

45581 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
b4a29247ff Merge "Set content description on CalendarView day labels" into lmp-mr1-dev 2014-10-16 01:07:04 +00:00
Brian Carlstrom
20de619d66 Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev 2014-10-16 01:01:26 +00:00
Alan Viverette
e3171d2762 am c07241ca: am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev 
* commit 'c07241cab3aa3f2fdc7b39a37861c22f245bd8f1':
  Document Toolbar's vertical alignment strategy
 2014-10-16 00:57:09 +00:00
Alan Viverette
6950153f95 am 205a5e69: am 8afc90fd: Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 
* commit '205a5e69cc7f2cf30202cf1e122670aac254e5f1':
  Add style support to PopupMenu, clean up constructor javadoc
 2014-10-16 00:57:03 +00:00
Alan Viverette
0511023432 Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev 2014-10-16 00:46:24 +00:00
Alan Viverette
8afc90fd71 Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev 2014-10-16 00:44:36 +00:00
Adam Powell
c928beac47 am f8c7d87a: am 19c0a163: Merge "View measurement optimization" into lmp-mr1-dev 
* commit 'f8c7d87a65f7a94201d7aa3c7ff3f474b83f43db':
  View measurement optimization
 2014-10-16 00:32:14 +00:00
Adam Powell
19c0a1632f Merge "View measurement optimization" into lmp-mr1-dev 2014-10-16 00:21:29 +00:00
Alan Viverette
29632521c3 Add style support to PopupMenu, clean up constructor javadoc 
BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
 2014-10-15 17:19:30 -07:00
Libin.Tang@motorola.com
c28147490a am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db. 
* commit '4798bca2742a3e2ec7e13aa20a61fc447eadf29b':
  IMS:change enhanced 4g setting to store in setting db.
 2014-10-15 23:56:23 +00:00
George Mount
7c479f5a01 Use empty snapshots list when there are no shared elements. 
Bug 17964119

Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
 2014-10-15 16:21:51 -07:00
Libin.Tang@motorola.com
0499bb5de4 IMS:change enhanced 4g setting to store in setting db. 
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
 2014-10-15 16:12:39 -07:00
Alan Viverette
ef71947fd3 Set content description on CalendarView day labels 
BUG: 17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
 2014-10-15 14:16:41 -07:00
Alan Viverette
67945c11a5 Update AM/PM selectors for clock face TimePicker 
The selectors are now CheckedTextViews, which makes more sense when
using a screen reader.

BUG: 17468036
Change-Id: I09c62a08172a710faa8fb7ed2bf99a66331e5701
 2014-10-15 13:20:54 -07:00