drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,461 Commits 1 Branch 0 Tags
Commit Graph

197461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schaub
2b856100f6 Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs 2015-07-13 23:41:29 +00:00
Roshan Pius
2ce65bddb5 am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev 
* commit 'cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
  Catch & log security exception in telephonymanager
 2015-07-13 23:31:19 +00:00
Selim Cinek
7025f26a99 Removed logging for the empty keyguard 
Only logging the states in the bugreport now.

Bug: 21701756
Change-Id: I8252583300d0162b878dd217c8098c1d6b970ea4
 2015-07-13 16:26:29 -07:00
Robert Schaub
28006a3b31 am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs 
* commit '7182f075fad7865eb8c1ce58d90327addabc7c4b':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup
 2015-07-13 23:23:48 +00:00
Robert Schaub
1962b73006 am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 
* commit '3430bec7e0b2f7a0552a66a523e478cd2ecd9043':
  docs: Removed parenthetic phrase that made explanation unnecessarily confusing
 2015-07-13 23:23:43 +00:00
Robert Schaub
2c5d93ae5f docs: Removed references to lockscreen widgets, added note to Android 5.0 
changes page

Removed one line from source code sample as well.

Bug: 20826638
Change-Id: I3c27353db0f0092c21962f9beec1bf1da52ee9d5
 2015-07-13 16:19:08 -07:00
Roshan Pius
cf01fd0f12 Merge "Catch & log security exception in telephonymanager" into mnc-dev 2015-07-13 23:17:04 +00:00
Robert Schaub
7182f075fa Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs 2015-07-13 23:12:44 +00:00
Robert Schaub
3430bec7e0 Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs 2015-07-13 23:06:46 +00:00
Amit Mahajan
66eb1ad11e am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev 
* commit '53e5ba22c1694fad23b67d18c42c01d6deada5f6':
  Do not check runtime READ_PHONE_STATE if caller has the privileged one.
 2015-07-13 23:03:34 +00:00
John Reck
074b3ceb84 am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev 
* commit 'f96d9c5421b7df1c60024a0928639e18c6d96b7b':
  Improve resource loading by ~3x
 2015-07-13 23:03:25 +00:00
Wale Ogunwale
eb2153c700 am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit '093d8de298c258943ca79c1cf429f5ef5725d1bb':
  Finish already paused activity if it should be finished after pausing
 2015-07-13 23:02:52 +00:00
Vinit Deshpande
3f96f8b2ff am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev 
* commit '0bd08fc22ae457791d95a4d557051e6601516bd0':
  Fix multiple SSIDs for same Passpoint issues
 2015-07-13 23:02:36 +00:00
Jim Miller
a95d9f0b72 am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev 
* commit '16c1764cf552432d304eaefd912d5aebe3192449':
  Change MANAGE_FINGERPRINT permission to system|signature
 2015-07-13 23:02:24 +00:00
Aravind Akella
42cae4aba7 am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 
* commit '37511e35ae22ea88539f1137ea2f74c9cb17f60c':
  Log full class name of the client activating sensors for better debugging.
 2015-07-13 23:02:13 +00:00
Etan Cohen
686be93854 am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev 
* commit 'c09544bb88ada53494d4a955d0450a22985b4799':
  Fix filter on CONNECTIVITY_ACTION updates
 2015-07-13 23:02:07 +00:00
Amith Yamasani
7efb0521ff am 1578357d: Merge "Check user state after clearing identity." into mnc-dev 
* commit '1578357df737296aa151c6934fe7dd749a43ae15':
  Check user state after clearing identity.
 2015-07-13 23:02:03 +00:00
Chris Wren
d5b0f69a45 am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev 
* commit '208934ff010cc2aff7d8fee9237d6cee0e5bb563':
  fix build by restoring deleted enum
 2015-07-13 23:01:57 +00:00
Julia Reynolds
19fd86589b am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev 
* commit 'fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
  Remove personal/device group from sideloading screen.
 2015-07-13 23:01:53 +00:00
Jason Monk
cdeeeb6906 am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev 
* commit '28a07ff0e1bf6029653ceaaa7bbfae0080ee05d7':
  Fix demo mode issues
 2015-07-13 23:01:39 +00:00
Chris Wren
2d8e017303 am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev 
* commit '4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
  add new enums to MetricsConstans
 2015-07-13 23:01:35 +00:00
Jason Monk
a04f5f2778 am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev 
* commit '59b1dfef62a041920f36c8e3e376d38facdd9c8d':
  Show volume restriction toast on all users
 2015-07-13 23:01:32 +00:00
Geoff Mendal
d64aa49305 am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c021aaaf6bd085d7332a33232e8118bab50ecc1f':
  Import translations. DO NOT MERGE
 2015-07-13 23:01:27 +00:00
Rubin Xu
f5d6d432af am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev 
* commit 'cf9aebf138a3ec07277b1e5564751d2396a155c0':
  Remove ExternalStorageFormatter
 2015-07-13 23:01:21 +00:00
Esteban Talavera
f463ac6647 am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev 
* commit '0ec43f89d2fc7064e7b42b40b318bef15fb040b5':
  Use correct user when filtering app link candidates
 2015-07-13 23:01:05 +00:00
Esteban Talavera
4b1145759b am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev 
* commit '2292160320f29144f8f8f38bd6936e9f1efb4ae5':
  Don't send app links to parent profile if status == never
 2015-07-13 23:01:01 +00:00
Billy Lau
f028ba3db3 am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 
* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
 2015-07-13 23:00:54 +00:00
Zhijun He
a9fc8aa3c8 am 4fb81253: Camera metadata: fix typos. 
* commit '4fb81253edc726936d4b71b7e9c0789cab45e9da':
  Camera metadata: fix typos.
 2015-07-13 23:00:50 +00:00
Geoff Mendal
a2360b8301 am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1962ad3e09552af679feaad34452e164facb625b':
  Import translations. DO NOT MERGE
 2015-07-13 23:00:44 +00:00
Geoff Mendal
01b006e1ea am d64ba82e: (-s ours) Import translations. DO NOT MERGE 
* commit 'd64ba82e8953810dd8420e7810be016831528bed':
  Import translations. DO NOT MERGE
 2015-07-13 23:00:31 +00:00
Raph Levien
93a2c97dc7 am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev 
* commit '1b3d03512e7bc759d3cd340280d7a5c59195a063':
  Improve Html.toHtml() documentation
 2015-07-13 23:00:20 +00:00
Amith Yamasani
0fd2d2b124 am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev 
* commit '292eb65f1ee0747e60899c1b1d0b6cb16c9cd37a':
  Fix new user creation regression due to vold remount calls
 2015-07-13 22:45:33 +00:00
Amith Yamasani
8117c2f8e4 am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev 
* commit '5449ee078620255ce9bea60c0a4dbece36e6acf9':
  Avoid IPC call with an empty array
 2015-07-13 22:45:29 +00:00
Sanket Padawe
0a66123f62 am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev 
* commit '233bd3ceffbe247b5230f2832ad63c6cf1d9ed13':
  Changes security for Passpoint to EAP security from "Passpoint".
 2015-07-13 22:30:37 +00:00
Adrian Roos
dc445a115f am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev 
* commit 'd374c20fc9269913d19666f0994268ed457e0d42':
  Fix flash of uninitialized surface
 2015-07-13 22:30:29 +00:00
Carlos Valdivia
cc3c93d30c am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev 
* commit '97cf0f1d76f1747302e0171c1cd4f0655fde99c4':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
 2015-07-13 22:30:24 +00:00
Mady Mellor
7fac4d6cc4 am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev 
* commit '1c277ca8cd699b15e631342775d996404a75e660':
  Fix: line slop shouldn't always increase / decrease by one line
 2015-07-13 22:30:13 +00:00
Mady Mellor
24950db276 am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev 
* commit 'a9f07ccf38709be29137dec246bca7fea976a294':
  Fix line slop issue at end of line for Thai & CJK
 2015-07-13 22:30:08 +00:00
Wale Ogunwale
6ede9b679e am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev 
* commit '26b0f1e420c0590ea5e9c506f4f14ba4b0a873f0':
  Revert "Finish already paused activity if it should be finished after pausing"
 2015-07-13 22:29:46 +00:00
John Reck
459337c8d4 am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev 
* commit '8657d9e8a56af7847578b65a881016da985b3531':
  JNI optimization tweaks to Paint high-frequency methods
 2015-07-13 22:29:41 +00:00
Chris Craik
be10a86620 am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev 
* commit '9f0049200824ae523a6cd39b9866c709d42e3075':
  Reduce cost of span type checking
 2015-07-13 22:29:36 +00:00
Alex Klyubin
6f2eb6d7a6 Fix Android Keystore key factories to obey JCA contract. 
Android Keystore provider's KeyFactory and SecretKeyFactory
implementations were throwing UnsupportedOperationException instead of
InvalidKeyException/InvalidKeySpecException from their
translateKey/generateKey methods.

Bug: 22459811
Change-Id: I6d5a5dc1bed724e858ad324d558b7480b9b848da
 2015-07-13 15:26:17 -07:00
Amit Mahajan
53e5ba22c1 Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev 2015-07-13 22:08:38 +00:00
John Reck
f96d9c5421 Merge "Improve resource loading by ~3x" into mnc-dev 2015-07-13 21:50:28 +00:00
John Reck
4feb326015 Improve resource loading by ~3x 
Bug: 22392651

ColorStateLists were never cached because the lazy-create
of the constant state had a typo.

Resource caching in general was broken because ThemeKey did not
clone the hash code, so all keys in the cache had a hashCode
of 0 which did not match the real, uncloned ThemeKeys hash code
so the binary search in ArrayMap based off of hash code was failing.

Change-Id: I9df1628b226bfa797bed97875354c19bf64f41ad
 2015-07-13 14:42:43 -07:00
Jason Monk
ab52527262 Add a dumpsys for KeyguardUpdateMonitor 
Include the info used when determining carrier text display.

Bug: 22212693
Change-Id: I12f01683c259ff11c7f27eec5d03d53f0b290d0b
 2015-07-13 17:05:16 -04:00
Paul Crowley
bac3d0936d Merge "Delete the user key when deleting a user." into mnc-dr-dev 2015-07-13 20:53:57 +00:00
Paul Crowley
9e0e69915a Merge "Use mount service to create user dirs." into mnc-dr-dev 2015-07-13 20:53:09 +00:00
Wale Ogunwale
093d8de298 Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 2015-07-13 20:49:37 +00:00
Chris Craik
e310f83d59 Fix unsafety in SkiaShader storage, and texture unit accounting 
bug:22390304

Fixes two issues:

1) The max texture unit wasn't large enough to handle the most complex
ComposeShader case (1 for draw primitive, 2 for gradient shader, 1 for
bitmap shader).

2) If a shader isn't supported by SkiaShader::store, the shader data
needs to be explicitly disabled, so we won't read uninitilized data
from it when trying to read shader information out.

Change-Id: I29ee7b7c1e07f67db88c1707bdc857daa305e713
 2015-07-13 13:34:07 -07:00