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

163338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
97e0ba6912 am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
* commit 'b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
  Add DENSITY_280
 2015-02-12 02:25:29 +00:00
Adam Powell
b73e029fea am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
  Add DENSITY_280
 2015-02-12 02:13:03 +00:00
Adam Powell
0ec652cf72 Merge "Add DENSITY_280" into lmp-mr1-dev 2015-02-12 02:08:04 +00:00
Craig Mautner
18d836b618 Merge "Don't relayout based on a window that isn't visible" into lmp-mr1-modular-dev 2015-02-11 22:27:06 +00:00
Adam Powell
f6d4045d6c Add DENSITY_280 
Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
 2015-02-11 13:34:43 -08:00
Craig Mautner
082500c76e Don't relayout based on a window that isn't visible 
The method commitFinishDrawingLocked returned true even if the window
it was called for was hidden. By returning the value that
performShowLocked() returns it only returns true if the window is
shown.

Fixes bug 19100757.

Change-Id: I45df70aedcb3909561fd3a19e861579a11521db9
 2015-02-11 13:24:19 -08: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Luan Nguyen
c25adda636 docs: Fix various issues with incorrect code samples. 
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
 2015-02-10 09:39:44 -08:00
John Spurlock
43c7741c28 Doze: pulse less often. 
automerge: 618e420

* commit '618e420adf2ab2478f62891738320bb9cc5260ec':
  Doze: pulse less often.
 2015-02-10 17:32:27 +00:00