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

158475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Charlton
f8af51bf6f am 843e2343: Add WindowManager.aidl to AIDL list 
* commit '843e234318421b320e74bb2d09c3b436d82ee127':
  Add WindowManager.aidl to AIDL list
 2014-10-15 23:57:38 +00:00
RoboErik
d7f699421e am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev 
* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata
 2014-10-15 23:57:11 +00:00
Tom Taylor
1e7c2c8738 am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:57:03 +00:00
Evan Charlton
843e234318 Add WindowManager.aidl to AIDL list 
WindowManager.aidl has an inner class (WindowManager.LayoutParams)
which needs to be included, but slipped past the api/current.txt grep.

This affects the SDK only

Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
 2014-10-15 13:26:32 -07:00
RoboErik
c7be69f1d6 Merge "Don't call size on a null metadata" into lmp-dev 2014-10-15 19:48:50 +00:00
Prashant Malani
5fc9415452 am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit 'c64522fb2e1893c21b1b1cc9051a3d1013c5d987':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 19:22:03 +00:00
Ricardo Cervera
05957deeb9 am 7e50d970: am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '7e50d9706cd0d7cd5c58c976fd582c81478a975c':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:21:58 +00:00
Luan Nguyen
892f693e12 am bff5c193: am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'bff5c1932c6bdd2a777b4236f9f1d562a53029fb':
  docs: Android Wear Design fixes
 2014-10-15 19:21:53 +00:00
smain@google.com
e2b8270c78 am b3994c2e: am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'b3994c2e58c7cebef8274ff6d801819a2b189183':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:21:48 +00:00
smain@google.com
1ca528ee4e am 2912627e: am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '2912627e007b95cf4b16c9e52a3acbec0c8bae60':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 19:21:43 +00:00
Tom Taylor
6d4f457546 Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 2014-10-15 19:20:36 +00:00
RoboErik
421c9df7ff Don't call size on a null metadata 
bug:18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
 2014-10-15 12:17:43 -07:00
Prashant Malani
c64522fb2e am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 19:12:33 +00:00
Ricardo Cervera
7e50d9706c am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:12:26 +00:00
Luan Nguyen
bff5c1932c am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-15 19:12:18 +00:00
smain@google.com
b3994c2e58 am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:12:05 +00:00
smain@google.com
2912627e00 am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 19:11:43 +00:00
Jim Miller
839685bc57 am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:26:02 +00:00
Jim Miller
e7c325559d Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev 2014-10-15 18:21:52 +00:00
Amith Yamasani
54be1ea752 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
 2014-10-15 17:48:50 +00:00
Amith Yamasani
2c3886cb34 Merge "Fix admin policies in managed profiles" into lmp-dev 2014-10-15 17:44:24 +00:00
Amith Yamasani
242f4b1259 Fix admin policies in managed profiles 
Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.

Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.

Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.

Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.

Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
 2014-10-15 10:42:17 -07:00
Tom Taylor
48ed835468 Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
Bug 17969135

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
 2014-10-15 10:20:17 -07:00
Chih-Hung Hsieh
60d53ebedb am 57622210: (-s ours) am e67bc0c9: (-s ours) Merge "Fix log call output format error. (DO NOT MERGE)" 
* commit '57622210fb9c8f9af21b85e87e93b7081db9f99c':
  Fix log call output format error. (DO NOT MERGE)
 2014-10-15 17:14:25 +00:00
Chih-Hung Hsieh
57622210fb am e67bc0c9: (-s ours) Merge "Fix log call output format error. (DO NOT MERGE)" 
* commit 'e67bc0c96733cee01e6f3027d9e6243f10ebbe40':
  Fix log call output format error. (DO NOT MERGE)
 2014-10-15 17:09:03 +00:00
Chih-Hung Hsieh
e67bc0c967 Merge "Fix log call output format error. (DO NOT MERGE)" 2014-10-15 17:03:07 +00:00
Prashant Malani
645e017ca5 Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 2014-10-15 17:02:02 +00:00
Jeff Sharkey
96b46ebaee am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
 2014-10-15 16:53:28 +00:00
Jeff Sharkey
88a6ed5477 Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 2014-10-15 16:49:05 +00:00
Chih-Hung Hsieh
e07c9f140e Fix log call output format error. (DO NOT MERGE) 
Cherry picked from googleplex-android c/445200.

BUG: 17916851
Change-Id: If4077e94d6dc7ef31ecf09cbcf41091c7e30268f
 2014-10-15 16:48:22 +00:00
Tony Hill
ded6b4bf71 am 8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network 
* commit '8e0297155075f9772dd6e8b8194da074dca008f8':
  Do not show roaming icon for BT Mobile SIM camped on EE UK network
 2014-10-15 16:27:12 +00:00
Jeff Sharkey
97d47ed036 Reduce PackageInstaller Binder memory pressure. 
When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions.  To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.

Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
 2014-10-15 09:19:54 -07:00
Neil Fuller
12f427d0b5 am 1802567a: am e4625cc1: Merge "Fix Time docs to document various error cases" 
* commit '1802567a79b2fc94aa1dff387cd55db8521cdca6':
  Fix Time docs to document various error cases
 2014-10-15 16:05:56 +00:00
Neil Fuller
1802567a79 am e4625cc1: Merge "Fix Time docs to document various error cases" 
* commit 'e4625cc1a861615f4b3447e2a4d4990590d51470':
  Fix Time docs to document various error cases
 2014-10-15 16:01:01 +00:00
Neil Fuller
e4625cc1a8 Merge "Fix Time docs to document various error cases" 2014-10-15 15:56:06 +00:00
Ricardo Cervera
dc1f308048 am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit '8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 15:50:42 +00:00
Ricardo Cervera
8a7ba4c681 Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 2014-10-15 15:47:31 +00:00
Luan Nguyen
c07a288a88 am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit '2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
  docs: Android Wear Design fixes
 2014-10-15 15:17:40 +00:00
Luan Nguyen
2a364235d2 Merge "docs: Android Wear Design fixes" into klp-modular-docs 2014-10-15 15:12:24 +00:00
Tony Hill
8e02971550 Do not show roaming icon for BT Mobile SIM camped on EE UK network 
Bug: 17986042
Change-Id: Ia9802c12363bbe6e93cf0b2e524351b6a3f4871c
 2014-10-15 08:03:03 -07:00
Neil Fuller
7079f2003c Fix Time docs to document various error cases 
Bug: https://code.google.com/p/android/issues/detail?id=76386
Change-Id: Ibb71405b70453d5abaf45426ec4e36261b6695cf
 2014-10-15 12:08:05 +01:00
Jinsuk Kim
c38402158b am 5873c3e8: Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 
* commit '5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 05:15:13 +00:00
Jinsuk Kim
5873c3e862 Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 2014-10-15 05:11:00 +00:00
smain@google.com
e43bb6a9ec am 075531ae: add the butterbar for L announce to Preview landing page 
* commit '075531ae190dd6e64d3a53991a209a624cb0ec63':
  add the butterbar for L announce to Preview landing page
 2014-10-15 03:36:11 +00:00
smain@google.com
075531ae19 add the butterbar for L announce to Preview landing page 
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
 2014-10-14 19:39:11 -07:00
smain@google.com
6fbe299fa5 am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit 'd8d20f52ec0550477b773cee4c0f0343f2a9301f':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 02:15:35 +00:00
smain@google.com
d8d20f52ec update analytics event tracking calls to use new script 
bug: 16331906

Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
 2014-10-14 19:03:08 -07:00
Jeff Sharkey
40a13df16f am 97978808: Start cross profile intents as caller. 
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
  Start cross profile intents as caller.
 2014-10-15 01:59:18 +00:00
Craig Mautner
1559d9d15f DO NOT MERGE Add empty ArrayList check. 
Fixes bug 15768779.
Fixes bug 17955259.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
 2014-10-15 01:30:10 +00:00
Jeff Sharkey
9797880808 Start cross profile intents as caller. 
The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
 2014-10-14 17:57:28 -07:00