Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Wei Wang
020bd7b861 Remove spammy log information for BLE scan. 
Bug:17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
 2014-10-18 00:29:57 +00:00
Alan Viverette
e61519b4a5 am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position
 2014-10-18 00:26:21 +00:00
Alan Viverette
6fffe58bf4 am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position
 2014-10-18 00:26:00 +00:00
Alan Viverette
15e7b2ac60 Merge "Translate compound button drawable by scroll position" into lmp-dev 2014-10-18 00:20:27 +00:00
Alan Viverette
b95c336d78 Translate compound button drawable by scroll position 
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
 2014-10-17 17:19:12 -07:00
Jim Miller
6955be046a am 8596960e: am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit '8596960eb5e072f5514f8863bfd09aac7a43611b':
  Add utility methods to LockPatternUtils for encryption
 2014-10-18 00:12:13 +00:00
Jim Miller
8596960eb5 am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit '956e424d007df454cc4a2bfc576336eb0c8f20e4':
  Add utility methods to LockPatternUtils for encryption
 2014-10-18 00:07:35 +00:00
Jim Miller
d9b81b11b9 am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:57:33 +00:00
Jim Miller
527664c88c am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:52:44 +00:00
Jim Miller
a054a8280c am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:52:41 +00:00
Jim Miller
c6c843fbe8 Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 2014-10-17 23:48:21 +00:00
Svetoslav
e7797227c4 am f4346545: am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'f43465452bb782166a4cb96dbfede9e7514787ba':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:25:25 +00:00
Svetoslav
f43465452b am 0ee9f361: am 0b5af04a: am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit '0ee9f36140530cf8ee60613f4f057c2ec95fe498':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:19:57 +00:00
Svetoslav
0b5af04a8b am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:09:55 +00:00
Jim Miller
dd5de719c5 Add utility methods to LockPatternUtils for encryption 
This enables a change in Settings that allows device
encryption to be disabled by the user.

Fixes bug 17881324

Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
 2014-10-17 16:08:21 -07:00
Svetoslav
5ee758932a am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:04:13 +00:00
Svetoslav
ebb38bcc03 am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:04:12 +00:00
Svetoslav
cd2b54e6e5 Merge "Accessibility no longer overrides strong encryption." into lmp-dev 2014-10-17 22:59:22 +00:00
William Bourke
ef0b5f56c9 am 83c97bab: am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '83c97babb00b4b78747d5b14be2ed7dba6f438b0':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:25:48 +00:00
Dianne Hackborn
b3af4ec6ba Fix issue #17948288: Improve accuracy of memory use reporting 
We now use Mapped to not double-count cached pages that are
mapped in to app processes.  Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.

It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space.  I need to figure out
how I was finding that before.

Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
 2014-10-17 15:25:13 -07:00
William Bourke
83c97babb0 am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:20:44 +00:00
William Bourke
44d515457a am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:09:19 +00:00
William Bourke
e4444d0fd6 am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:04:44 +00:00
William Bourke
7d5c68e31e am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:03:50 +00:00
William Bourke
33f577cfea Modified lollipop Easter egg for TV compatibility 
Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
 2014-10-17 21:57:23 +00:00
Svetoslav
a6711ff6f0 Accessibility no longer overrides strong encryption. 
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
 2014-10-17 14:33:11 -07:00
Adam Lesinski
985adb98b6 am 7dd87312: am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 
* commit '7dd87312c9e9ee52c7c945785c6d3b274b3004b3':
  Minor resource notation/compatibility fixes
 2014-10-17 21:28:32 +00:00
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
Alan Viverette
177ec4608e Only request layout when removeView() actually removes a view 
BUG: 18035456
Change-Id: Iec82be63ef9fc4d0ff90d93f8f3a65328a5e1eba
 2014-10-17 13:34:50 -07:00
Adam Lesinski
7dd87312c9 am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 
* commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a':
  Minor resource notation/compatibility fixes
 2014-10-17 20:28:47 +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
Alan Viverette
26c563b051 Prevent excessive accessibility announcements in TimePicker 
This is not a complete solution, and it's still awkward to use for
actually setting the time using the radial time picker. Better
software keyboard support and explore-by-touch CLs are still pending.

BUG: 17994166
Change-Id: Ia2871840a13cb00c140f7f2ab07fe03371acab2f
 2014-10-17 12:49:16 -07: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
Adam Lesinski
12c84b5d9f Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 2014-10-17 19:17:20 +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
3de84d0de6 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 18:58:58 +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