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

156456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nancy Chen
68a4192126 am 00bc5cf8: am 9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 
* commit '00bc5cf896814f55db4dd27be72fe26bc48a0d0b':
  Add API method to extract subscription ID from phone account (1/3)
 2014-10-15 18:55:06 +00:00
Nancy Chen
00bc5cf896 am 9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 
* commit '9faf13b47467916897cf5c019a3a74df871b8f65':
  Add API method to extract subscription ID from phone account (1/3)
 2014-10-15 18:50:38 +00:00
Jay Shrauner
2ec53ebbc6 Remove unused onConferenceWith method 
Never part of public API

Bug:17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
 2014-10-15 11:48:04 -07:00
Nancy Chen
9faf13b474 Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 2014-10-15 18:47:03 +00:00
Jim Miller
1a02efb124 am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'ce711c6d57732c3582da0828c0361f55381f4223':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:37:06 +00:00
Jim Miller
ce711c6d57 am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f 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:59 +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
ecb7b899b0 am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '5c8cafa6143858f725dd1bb73da7ac9f8d8f8f5f':
  Fix admin policies in managed profiles
 2014-10-15 18:07:49 +00:00
Amith Yamasani
5c8cafa614 am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
  Fix admin policies in managed profiles
 2014-10-15 17:54:34 +00:00
Amith Yamasani
01ddc75fc1 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
 2014-10-15 17:49:19 +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
John Spurlock
e5b42d97f6 Leave zen when apps set ringer-mode = non-silent (normal/vibrate). 
Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
  (normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
 2014-10-15 13:32:31 -04: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
Andrew Solovay
bab257453b Moved TV Input Framework (TIF) page out of preview. 
See first comment on CL for the doc staging location. Setting up a
redirect for the old page with CL http://ag/566783

Change-Id: Ibd391cb3fe357495ecf3dc70b1edeadee12075f3
 2014-10-15 10:10:11 -07:00
Jeff Sharkey
fbfd900aa8 am 2df76285: am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 
* commit '2df76285914692973a4dfa6d600a71584e3e1c2a':
  Reduce PackageInstaller Binder memory pressure.
 2014-10-15 17:03:30 +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
2df7628591 am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 
* commit '203ed4db9656cc3047c65e12e3969d21652d4ccf':
  Reduce PackageInstaller Binder memory pressure.
 2014-10-15 16:58:49 +00:00
Jeff Sharkey
203ed4db96 am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 
* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
  Reduce PackageInstaller Binder memory pressure.
 2014-10-15 16:53:09 +00:00
Jeff Sharkey
88a6ed5477 Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev 2014-10-15 16:49:05 +00:00
Tony Hill
246c1f6922 am 8c13d83e: am a5380d96: am 8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network 
* commit '8c13d83e5f297e5d3440afc74f38fd578f1fe480':
  Do not show roaming icon for BT Mobile SIM camped on EE UK network
 2014-10-15 16:40:04 +00:00
Tony Hill
8c13d83e5f am a5380d96: am 8e029715: Do not show roaming icon for BT Mobile SIM camped on EE UK network 
* commit 'a5380d9664f89a8f46165e4186eb023f8f392301':
  Do not show roaming icon for BT Mobile SIM camped on EE UK network
 2014-10-15 16:32:46 +00:00
Tony Hill
a5380d9664 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:28 +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
Lorenzo Colitti
ad4cd0c019 Allow root and system to bypass the always-on VPN firewall rules 
This is needed to allow the always-on VPN to survive network
switches. In L, network switches are graceful, and in order to
switch to a network, the system first has to validate it using
DNS requests (from netd, running as root) and HTTP requests
(from NetworkMonitor, running inside the system_server).

This should also allow always-on VPN to work on networks like
T-Mobile that use 464xlat, fixing a bug that has been present
since K.

Bug: 9597277
Bug: 17695048
Change-Id: I0daa5707f2139339f9ececde0e73aac3bf23fdc3
 2014-10-16 01:16:50 +09:00
Lorenzo Colitti
02c7abac85 Don't make lockdown VPN source firewall rules over-broad. 
Currently, the lockdown VPN adds firewall allow rules matching
the whole subnet that the server assigned, so for example if
the VPN server assigns it the IP address 10.1.23.5/8, it will
allow the whole of 10.0.0.0/8 to pass the firewall.

This is needlessly overbroad and has a particularly bad corner
case where if the prefix length is 0, everything is allowed.

Bug: 17695048
Change-Id: Idbec4b3aea0f72f9bdfd26dcd72d6a97d026fb12
 2014-10-16 01:16:50 +09:00
Lorenzo Colitti
0cb7903dde Propagate network state changes to the LockdownVpnTracker. 
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
 2014-10-16 01:16:50 +09:00
Jeff Davidson
f2a598e445 am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev 
* commit '074c5b5b65295ee57c4223360604aba51479d783':
  Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
 2014-10-15 15:54:20 +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
Jeff Davidson
074c5b5b65 Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev 2014-10-15 15:49:26 +00:00
Ricardo Cervera
8a7ba4c681 Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 2014-10-15 15:47:31 +00:00
Adrian Roos
27c3ab630a Prevent ChooserActivity from taking over the system bars 
Bug: 17939334
Change-Id: I4d028695a1f81442cbbe7067b33475634effd5d2
 2014-10-15 17:22:27 +02:00
Tyler Gunn
f2e59c0eb7 am 234703b3: Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-dev 
* commit '234703b3a1d2477b38be9402e69652ecaee6ee68':
  MR1 - Adding more Telecom state dumping.
 2014-10-15 15:21:23 +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
Tyler Gunn
234703b3a1 Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-dev 2014-10-15 15:15:25 +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
Narayan Kamath
8091edbffb Set threads' contextClassLoader during LoadedApk.makeApplication. 
We used to set this from LoadedApk.getClassLoader. This had
the unfortunate side effect of clobbering the threads default
classloader when Context.createPackageContext().getClassLoader()
was called. This happens, for example, to every app that uses
a updatable webview.

bug: 17986934
Change-Id: If2b5938a19f836ea5fe60c94ea53a7125c2098c0
 2014-10-15 11:38:44 +01:00
Jinsuk Kim
18279da701 am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
* commit 'f55cdab4bf9f9206d77748d0774065dc8438af0f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 07:22:15 +00:00
Jinsuk Kim
f55cdab4bf resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
Change-Id: Ic0693b6f2fdb2ea32a280297624b1fe435385deb
 2014-10-15 14:55:57 +09:00
Jinsuk Kim
f9a924ab81 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:16:12 +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
Jeff Sharkey
92ab2748ef am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '4d526bd249d720ef8dc54b8c7ecef9953e5be5c7':
  Start cross profile intents as caller.
 2014-10-15 03:06:00 +00:00