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

182072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Leon Scroggins III
efa5b61420 am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
* commit '7aa7f841dccfc36bb79e21c43fbf3028d4c6cc1c':
 2015-02-10 23:21:41 +00:00
Shanea King-Roberson
85da6a5f06 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 
* commit 'f9259107342559456105392e3387a3c8a1e5d6e4':
 2015-02-10 23:21:27 +00:00
Chris Warrington
3efee706af am 8ddf335a: am 44998887: am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
* commit '8ddf335a01cb9e83ceadd314739899895c84f0e1':
 2015-02-10 23:21:08 +00:00
Luan Nguyen
60e554a16a am 61dc64f3: am 6ee90183: am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '61dc64f38b2669a9e1599bc5595b760f31f586f7':
 2015-02-10 23:21:00 +00:00
Eric Gilmore
f184a008f9 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 
* commit '7372d2d1db3b56c2f6592c15a29d7c2fb00ccd1c':
 2015-02-10 23:20:19 +00:00
John Spurlock
3242e5d5d3 am 79448424: am 43c7741c: Doze: pulse less often. automerge: 618e420 
* commit '79448424c3fedeab19f09a931511ad05c1b5ce63':
 2015-02-10 23:19:54 +00:00
Fyodor Kupolov
4a39e1bb33 Merge "Added unit test for RegisteredServicesCache" 2015-02-10 23:06:29 +00:00
Wale Ogunwale
2bfd8678c7 Fixed typo in attr.resizeableActivity doc. 
Change-Id: Ia67ae5ad06d74e5fc2712b90c7513ccd7addf325
 2015-02-10 15:05:15 -08:00
Leon Scroggins III
094ff96b3f am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev automerge: dc77ec5 -s ours 
automerge: a6fab6e  -s ours

* commit 'a6fab6e114a80364714c463db3ac4b204730f08b':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-10 22:26:33 +00:00
Leon Scroggins III
a6fab6e114 am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
automerge: dc77ec5  -s ours

* commit 'dc77ec59beb23a2ff300d5048633687c0d68a0ac':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-10 22:21:09 +00:00
Leon Scroggins III
7aa7f841dc am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
* commit 'dc77ec59beb23a2ff300d5048633687c0d68a0ac':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-10 22:13:43 +00:00
Leon Scroggins III
dc77ec59be am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
* commit '3bb5fdc7e607febaad3bd41ed7a36b596b7286af':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-10 22:08:00 +00:00
Fyodor Kupolov
9e0d81e843 Added unit test for RegisteredServicesCache 
Minor refactoring of RegisteredServicesCache for testability. Added
RegisteredServicesCacheTest which uses a mock version of
RegisteredServicesCache.

Bug:19321135
Change-Id: If18b794b28f03b4bf4bbdfbba9e9a57e808aaebf
 2015-02-10 14:05:12 -08:00
Leon Scroggins III
3bb5fdc7e6 Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 2015-02-10 22:03:44 +00:00
Ruben Brunk
4b79268cb7 Merge "camera2: Formatting nitpicks." 2015-02-10 21:20:28 +00:00
Shanea King-Roberson
8fcfd06ce5 am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c automerge: accf077 
automerge: 524c460

* commit '524c46001f3f55552194b774c2e89c8c0ff0507c':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 21:01:45 +00:00
Leon Scroggins III
89a2466a2a Check that bitmap's size does not exceed 32 bits. DO NOT MERGE 
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
 2015-02-10 20:57:45 +00:00
Shanea King-Roberson
524c46001f am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c 
automerge: accf077

* commit 'accf0770306419773c3119eb32ca912077894b11':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:50:57 +00:00
Amith Yamasani
91e5f76854 Merge "Timeout to ensure user-switching dialog is closed" 2015-02-10 20:44:04 +00:00