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

160115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Joslin
20be0e25ba Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 2015-02-12 18:34:03 +00:00
Benjamin Franz
c70d0e71c0 Fix the javadocs for lock task mode intents. 
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
 2015-02-12 16:12:58 +00:00
Eino-Ville Talvala
a5f301c7fb Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 2015-02-12 05:33:28 +00:00
Lorenzo Colitti
c7ccc393b4 Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev 2015-02-12 02:30:56 +00:00
Jeremy Joslin
fcde58f155 Update Javadoc for EXTRA_NETWORK. 
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
 2015-02-11 18:28:57 -08:00
Adam Powell
0ec652cf72 Merge "Add DENSITY_280" into lmp-mr1-dev 2015-02-12 02:08:04 +00:00
Eino-Ville Talvala
b0acf7fcfa Legacy: Only set user surface dimensions on output surfaces 
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.

Bug: 16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
 2015-02-11 16:58:10 -08:00
Adam Powell
f6d4045d6c Add DENSITY_280 
Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
 2015-02-11 13:34:43 -08: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
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
c38b90bb6b Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev 2015-02-11 07:18:17 +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
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
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
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
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
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
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
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
618e420adf Doze: pulse less often. 
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.

Bug: 19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
 2015-02-10 09:23:29 -05:00
Chris Warrington
de3ab0a9e8 Fix AAPT daemon mode with paths containg spaces. 
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423

Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
 2015-02-09 21:20:52 -08:00
Svetoslav
c73cfa0ffb Accessibiltiy: missed update to the previous patch. 
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
 2015-02-09 18:33:07 -08:00
Eric Gilmore
c9dbaf0483 Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 2015-02-10 01:13:03 +00:00
Baligh Uddin
b2ba6dfc7b Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 2015-02-10 00:57:21 +00:00
kmccormick
0137175af9 Doc change: refactor GCM docs to be platform-agnostic. 
Fix for:

b/17733410

Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
 2015-02-09 16:28:15 -08:00
Andre Eisenbach
455502b750 Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 2015-02-10 00:21:43 +00:00
Matthew Xie
a63ba4287e Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 2015-02-09 21:50:58 +00:00
Daniel Sandler
6e3de6a19a Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev 2015-02-09 20:43:38 +00:00
Amith Yamasani
61333d1b51 Merge "Limit cache update to packages that have changed" into lmp-mr1-dev 2015-02-09 19:59:27 +00:00
Andre Eisenbach
2b8696e3a9 Add API to check if a Bluetooth connection is encrypted (1/2) 
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
 2015-02-09 11:31:06 -08:00
Rubin Xu
3d521c0a01 Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev 2015-02-09 19:25:20 +00:00
Amith Yamasani
460a7b4619 Limit cache update to packages that have changed 
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.

Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
 2015-02-09 11:10:31 -08:00
Adrian Roos
a48caee9a7 Added TEXT_CHANGED event to PasswordTextView 
Also creates a TextView-like accessibility node
and populates accessibility events with text if
required.

Bug: 18528774
Change-Id: I4a918a092b1e97879c31f54604cf957e01f4bc86
 2015-02-09 15:55:21 +00:00
Rubin Xu
99abeed2bb Perform post installation operations directly if backup manager is disabled 
bug: 19312753

Change-Id: I4acdd1e3af6a6be0c51affc42de167993c736b2f
 2015-02-09 15:36:30 +00:00
Adrian Roos
991db77a44 Only request IME if password view is showing 
Bug: 19250277
Change-Id: I881b08ebc6900ba43289b772ed0d039dbb62149c
 2015-02-09 13:26:02 +00:00
Zhijun He
07c745b525 Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev 2015-02-08 17:38:03 +00:00
Svet Ganov
f33fe1f486 Accessibility: Handle a missed case when clicking focused views. 
The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.

bug:19252492

Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
 2015-02-07 10:36:59 -08:00
Zhijun He
dd72be5971 camera-metadata: clarify the AE precapture trigger spec 
Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
 2015-02-06 17:51:34 -08:00