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

182112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
62958c7f30 am 33bb70d6: am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
automerge: c093955

* commit 'c093955af1434a7023093acb148ab152d915e59c':
 2015-02-11 20:03:06 +00:00
Michael Wright
c093955af1 am 33bb70d6: am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
* commit '33bb70d613cf8ed4664c4cc4047ae67f98599b32':
 2015-02-11 19:59:16 +00:00
Michael Wright
33bb70d613 am 40bd8f41: Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
* commit '40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
  Stop active media projections on user switch.
 2015-02-11 19:50:56 +00:00
Michael Wright
d08860690c Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e automerge: 40bd8f4 
automerge: fa5f1fb

* commit 'fa5f1fbc50050d26535e969ac68b04d318bbaf03':
  Stop active media projections on user switch.
 2015-02-11 18:53:36 +00:00
Michael Wright
fa5f1fbc50 Merge "Stop active media projections on user switch." into lmp-mr1-dev automerge: 3292c0e 
automerge: 40bd8f4

* commit '40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55':
  Stop active media projections on user switch.
 2015-02-11 18:43:29 +00:00
Michael Wright
40bd8f416b Merge "Stop active media projections on user switch." into lmp-mr1-dev 
automerge: 3292c0e

* commit '3292c0e2640667e5ef78896653a41c85e7de06c5':
  Stop active media projections on user switch.
 2015-02-11 18:33:00 +00:00
Michael Wright
3292c0e264 Merge "Stop active media projections on user switch." into lmp-mr1-dev 2015-02-11 18:23:55 +00:00
Scott Kennedy
0f5e1975d3 Merge "Add @Nullable to AttributeSet in a couple constructors" 2015-02-11 17:53:50 +00:00
Andrei Kapishnikov
5b4a198abd Merge "Do not throw NullPointerException from PacService" 2015-02-11 17:46:46 +00:00
Pirama Arumuga Nainar
fc8082ac41 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-11 17:23:22 +00:00
Pirama Arumuga Nainar
21761bc5de am 0cc09449: Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19 
* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:23:12 +00:00
Pirama Arumuga Nainar
87556283bc Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19 
automerge: 0cc0944

* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:21:41 +00:00
Pirama Arumuga Nainar
0cc09449b6 Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 
automerge: 1641e19

* commit '1641e192a82e266159e0b82078a8f98ebcd3d8ff':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:15:47 +00:00
Pirama Arumuga Nainar
1641e192a8 Merge "Store compiled code in Context.getCodeCacheDir()" 
automerge: 3fbbe39

* commit '3fbbe396faffeec6b46796087ad1e075e9a21f0d':
  Store compiled code in Context.getCodeCacheDir()
 2015-02-11 17:11:06 +00:00
Pirama Arumuga Nainar
3fbbe396fa Merge "Store compiled code in Context.getCodeCacheDir()" 2015-02-11 17:08:01 +00:00
Nicolas Prevot
5cfd3d8b51 Merge "Avoid NullPointerException in enableSystemApp if the app is absent." 2015-02-11 17:05:19 +00:00
Geoff Mendal
f54b42eace Merge "Import translations. DO NOT MERGE" 2015-02-11 16:41:37 +00:00
Geoff Mendal
a4c9489383 Import translations. DO NOT MERGE 
Change-Id: I7ff5ac2776891766c5879f6905785f33f588f1b0
Auto-generated-cl: translation import
 2015-02-11 08:06:19 -08:00
Geoff Mendal
36913bf78a Merge "Import translations. DO NOT MERGE" 2015-02-11 14:48:42 +00:00
Geoff Mendal
23032b3f21 Import translations. DO NOT MERGE 
Change-Id: I6498f5f266d79b90c3b41956290838e199e50999
Auto-generated-cl: translation import
 2015-02-11 06:46:44 -08:00
Nicolas Prevot
8b0c8ffb2d Merge "Dont throw an exception for non-system apps when enabling system apps." 2015-02-11 14:27:49 +00:00
Nicolas Prevot
0413046f12 Dont throw an exception for non-system apps when enabling system apps. 
In EnableSystemAppWithIntent: if a non-system app matches the intent:
ignore it instead of throwing an exception.

Change-Id: I64dc9a0bbc1a6bc5e2159a33b7273464ed2518c5
 2015-02-11 14:17:21 +00:00
Narayan Kamath
97a366f9d7 Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.." 2015-02-11 14:01:36 +00:00
Jeff Davidson
535809ab83 am 1d053b86: am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '1d053b868f9ab3d934956c59c33c7b4bb82ba589':
 2015-02-11 08:50:05 +00:00
Jeff Davidson
1d053b868f am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '5d8a31c46c947c2c5f56669c00e6c8aea31c47f7':
 2015-02-11 08:44:38 +00:00
Jeff Davidson
2d6063b63c am e4be48e0: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev automerge: 46dbb5b 
* commit 'e4be48e0853bcde90d738031433271c5e41bd5e2':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:44:34 +00:00
Jeff Davidson
e4be48e085 am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
automerge: 46dbb5b

* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:38:35 +00:00
Jeff Davidson
5d8a31c46c am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:37:30 +00:00
Jeff Davidson
46dbb5be4c am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 
* commit '50996a12a8e859346d5eb3c4569c4e81c9b52a05':
  Do not enforce CONTROL_VPN for calls from lockdown VPN.
 2015-02-11 08:30:44 +00:00
Jeff Davidson
50996a12a8 Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev 2015-02-11 08:25:27 +00:00
Lorenzo Colitti
b1d3df3269 am 0f0e93dc: am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
* commit '0f0e93dc702e97644bacceb7ac08552672a8151d':
 2015-02-11 07:45:49 +00:00
Jeff Davidson
b21298a686 Do not enforce CONTROL_VPN for calls from lockdown VPN. 
Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.

Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.

Bug: 19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972
 2015-02-10 23:41:42 -08:00
Lorenzo Colitti
492def9198 am 2d33b31c: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450 
* commit '2d33b31c86ade166b97cbb9085e0185f765932cb':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:40:08 +00:00
Lorenzo Colitti
0f0e93dc70 am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
* commit 'e1507ac506a4dac327a5cbabede0384836659de0':
 2015-02-11 07:39:23 +00:00
Lorenzo Colitti
e1507ac506 am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:33:10 +00:00
Lorenzo Colitti
2d33b31c86 Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b 
automerge: 00c8450

* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:32:53 +00:00
Lorenzo Colitti
00c8450d27 Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev 
automerge: c38b90b

* commit 'c38b90bb6bc5efc5f07e69b86d10f76a1eaa9eb4':
  Make getNetworkInfo() take into account VPN underlying networks.
 2015-02-11 07:24:50 +00:00
Lorenzo Colitti
c38b90bb6b Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev 2015-02-11 07:18:17 +00:00
Scott Kennedy
76c382ed67 Add @Nullable to AttributeSet in a couple constructors 
Change-Id: I184113680c5dc867b353df81961e93523b91bbc5
 2015-02-10 23:15:39 -08:00
Shishir Agrawal
cd25e1c6df am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 
automerge: ac46e82

* commit 'ac46e8240470eefbfebb852906a1972ee5faf4db':
 2015-02-11 06:35:51 +00:00
Shishir Agrawal
ac46e82404 am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 
* commit 'c54a87e302a2a28b16864f71b9db57241d68ca48':
 2015-02-11 06:28:28 +00:00
Shishir Agrawal
bad6337b08 GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 automerge: 6b27472 
automerge: b7e04f3

* commit 'b7e04f3294d2ce60450fcc6881249b6b0c6c30b0':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-02-11 03:52:52 +00:00
Shishir Agrawal
b7e04f3294 GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 
automerge: 6b27472

* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-02-11 03:44:42 +00:00
Shishir Agrawal
c54a87e302 am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 
* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-02-11 03:41:38 +00:00
Shishir Agrawal
6b274720c5 GpsLocationProvider: Read data enabled status from TelephonyManager. 
automerge: 64ce5f8

* commit '64ce5f8fab077e4792737f86502d0e77ad6cbb0b':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-02-11 03:35:42 +00:00
Shishir Agrawal
64ce5f8fab GpsLocationProvider: Read data enabled status from TelephonyManager. 
Bug: 18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
 2015-02-10 19:20:16 -08:00
Chong Zhang
d6686a62f7 Merge "media: discard duplicate CEA-608 ctrl code" 2015-02-11 02:35:08 +00:00
Alan Viverette
26c184b723 Update drawables for themeable color state list and layer-list gravity 
Removes some unused resources and replaces some 9-patches with XML.

Change-Id: Id49a2b715d7a10bf5eeb146062d20a42487334e1
 2015-02-10 17:23:50 -08:00
Lorenzo Colitti
d6a7980dd9 Make getNetworkInfo() take into account VPN underlying networks. 
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.

Bug: 19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
 2015-02-11 10:21:01 +09:00
Alan Viverette
0d89d3f0b1 Merge "Prevent temp rect reuse across methods in LayerDrawable" 2015-02-11 00:41:21 +00:00