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

182093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Alan Viverette
a756fd9af6 Prevent temp rect reuse across methods in LayerDrawable 
Drawable invalidation may call back into methods that are relying on
the same temp rect objects, which mangles the values.

Bug: 19321598
Change-Id: If8aa434cf85c81d22b5d580e258926087248cd93
 2015-02-10 16:39:46 -08:00
Nick Vaccaro
668ebe9501 am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev 
automerge: 5ff5711

* commit '5ff571155f0a405d6f7d298c7acaddc84bb8fb26':
  Update API to contain new wrist tilt sensor type and string.
 2015-02-11 00:39:14 +00:00
Marco Nelissen
9408ce362e am 6da3cc59: am 396f131d: Merge "Fix memory leak" 
automerge: fb14e77

* commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987':
  Fix memory leak
 2015-02-11 00:36:48 +00:00
Leon Scroggins III
a18554e6ca am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
automerge: efa5b61  -s ours

* commit 'efa5b6142082d8c958b09a932fc972261c405912':
 2015-02-11 00:35:11 +00:00
Nick Vaccaro
5ff571155f am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev 
* commit 'd0d13d822cdec4fa7214d1495137064c28ecc07e':
  Update API to contain new wrist tilt sensor type and string.
 2015-02-11 00:20:52 +00:00
Nick Vaccaro
d0d13d822c Merge "Update API to contain new wrist tilt sensor type and string." into lmp-mr1-modular-dev 2015-02-11 00:15:18 +00:00
Marco Nelissen
fb14e77f45 am 6da3cc59: am 396f131d: Merge "Fix memory leak" 
* commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
  Fix memory leak
 2015-02-11 00:00:57 +00:00
Andres Morales
667d55cf5a Merge "check bootloader and baseband version" 2015-02-10 23:59:46 +00:00
Shanea King-Roberson
e36fe7048e am f9259107: am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c 
automerge: 85da6a5

* commit '85da6a5f06424d7b7cab98b41c24ce147a5d830a':
 2015-02-10 23:56:57 +00:00
Chris Warrington
4a140310e3 am 8ddf335a: am 44998887: am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
automerge: 3efee70

* commit '3efee706af3b9b9ff12c525b032f36f59eb66c80':
 2015-02-10 23:54:58 +00:00
Marco Nelissen
6da3cc59a0 am 396f131d: Merge "Fix memory leak" 
* commit '396f131de7646faacd74ec3be11c4861bb233872':
  Fix memory leak
 2015-02-10 23:54:48 +00:00
Luan Nguyen
0557501a85 am 61dc64f3: am 6ee90183: am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
automerge: 60e554a

* commit '60e554a16affcc15d749b05d16490f0caa07fa83':
 2015-02-10 23:53:14 +00:00
Eric Gilmore
9a4c5dfe7d am 7372d2d1: am 2b7f0cff: am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
automerge: f184a00

* commit 'f184a008f9ce06f9653774c4bc9645a3b0abbbfb':
 2015-02-10 23:51:22 +00:00
John Spurlock
d791326c2a am 79448424: am 43c7741c: Doze: pulse less often. automerge: 618e420 
automerge: 3242e5d

* commit '3242e5d5d34afc4c11dee6fdf3f5ae78126e7ee6':
 2015-02-10 23:49:50 +00:00
Marco Nelissen
396f131de7 Merge "Fix memory leak" 2015-02-10 23:46:27 +00:00
Marco Nelissen
06524dccbc Fix memory leak 
Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
 2015-02-10 15:45:23 -08:00