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

174377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lorenzo Colitti
0831f66f19 Make reportInetCondition revalidate if the report differs from our state 
1. If reportInetCondition says the network is not working, and
   the network is already marked not validated, don't revalidate
   it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
   network is not marked as validated, revalidated. This will
   allow us to get out of a validated state quickly based on app
   input (e.g., allowing GCM's exponential backoff timer to drive
   revalidation instead of our 10-minute timer).

Bug: 19258761
Bug: 19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3
 2015-02-11 11:03:50 +09: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
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
Marco Nelissen
6da3cc59a0 am 396f131d: Merge "Fix memory leak" 
* commit '396f131de7646faacd74ec3be11c4861bb233872':
  Fix memory leak
 2015-02-10 23:54:48 +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
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
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
Pirama Arumuga Nainar
51772b7601 Store compiled code in Context.getCodeCacheDir() 
bug 16345623

Use Context.getCodeCacheDir for EGL shader cache and RenderScript
compiled code.

Change-Id: I54c4e43674bd1f9342ae13059cb8899f4a3f4734
 2015-02-10 13:17:30 -08: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
Nick Vaccaro
f5021f6818 Update API to contain new wrist tilt sensor type and string. 
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.

Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
 2015-02-10 20:43:44 +00:00
Shanea King-Roberson
f925910734 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 'accf0770306419773c3119eb32ca912077894b11':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:37:39 +00:00
Shanea King-Roberson
accf077030 am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
automerge: 696b68c

* commit '696b68c4fc65b671a00cfa82e6bc29a7d665828e':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:25:34 +00:00
Shanea King-Roberson
696b68c4fc am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:17:53 +00:00
Chris Warrington
4308c2aea4 am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
automerge: 4499888

* commit '449988872be61f273c91db13069d5b7172429032':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:14:44 +00:00
Shanea King-Roberson
24513bc580 am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '3162289445ebade804c422162578d328c4762372':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:10:38 +00:00
Chris Warrington
8ddf335a01 am 44998887: am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
* commit '449988872be61f273c91db13069d5b7172429032':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:07:28 +00:00
Luan Nguyen
891718acd5 docs: Fix notification api guide issues (7461154, 12765600) 
bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
 2015-02-10 12:05:50 -08:00
Shanea King-Roberson
3162289445 am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit 'c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:04:17 +00:00
Chris Warrington
449988872b am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
* commit '510c24e8930447811f6725cbf7f3cefec2194a5d':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:01:00 +00:00
Shanea King-Roberson
c86ac21f73 Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 2015-02-10 19:57:30 +00:00
Chris Warrington
510c24e893 Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 2015-02-10 19:56:32 +00:00
Luan Nguyen
c6ec79913f am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
automerge: 6ee9018

* commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:18:37 +00:00
Eric Gilmore
ac4dfec8b3 am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
automerge: 2b7f0cf

* commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 19:16:49 +00:00
Luan Nguyen
61dc64f38b am 6ee90183: am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:09:14 +00:00
Luan Nguyen
6ee90183ab am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '18fc7b85543cd21317475962521606038cd44383':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:02:50 +00:00
Luan Nguyen
18fc7b8554 am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'ba795593e5941d89a861bb848c3f98800a0be3d6':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:56:32 +00:00
Luan Nguyen
ba795593e5 am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '9b432bbece3cca6316b2638a947983e21c65917f':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:47:38 +00:00
Luan Nguyen
9b432bbece am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:40:34 +00:00
Luan Nguyen
e49fbfa21c Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e Adding videos for 5.0 changes and watch face development. 
On branch pilot-videos
 Changes to be committed:
	modified:   docs/html/about/versions/android-5.0-changes.jd
	modified:   docs/html/training/wearables/watch-faces/index.jd

Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
 2015-02-10 10:29:36 -08:00
Eric Gilmore
7372d2d1db am 2b7f0cff: am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
* commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:20:44 +00:00
Eric Gilmore
2b7f0cff1e am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
* commit 'f35e815939d60863ec84fdd906d96279b652e33c':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:12:47 +00:00
Eric Gilmore
f35e815939 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
automerge: 2b36779

* commit '2b36779f30a511cc4439a519c95963280a779fdc':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:05:23 +00:00
Eric Gilmore
2b36779f30 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit '99b91b2fd28888b20511316cb6f81b510b05cdf5':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:56:51 +00:00
Eric Gilmore
99b91b2fd2 am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:45:47 +00:00
John Spurlock
79448424c3 am 43c7741c: Doze: pulse less often. automerge: 618e420 
* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.
 2015-02-10 17:40:40 +00:00