Luan Nguyen
b967f7201a
am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb
...
* commit '71cf2b6d5344a45413f0c77691d7e1efb18b398f':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-13 00:19:25 +00:00
Luan Nguyen
e88f352264
am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d
...
* commit 'b14aec1b954f6fea5fc3ead9a289c8896f372096':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-13 00:19:20 +00:00
Luan Nguyen
474746c7b0
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
automerge: fe2c687
2015-02-13 00:16:48 +00:00
Luan Nguyen
71cf2b6d53
am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
...
automerge: e0306bb
2015-02-13 00:15:09 +00:00
Luan Nguyen
b14aec1b95
am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
...
automerge: 946bf2d
2015-02-13 00:13:35 +00:00
John Spurlock
e4049b6d36
am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
...
* commit 'f45e5dbf599a0043d7f6576f20eafb2c1c157204':
NoMan: Initialize filter value reported to listeners.
2015-02-12 22:58:44 +00:00
John Spurlock
f45e5dbf59
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
2015-02-12 22:52:13 +00:00
Jim Miller
b1e80278f8
am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
...
* commit 'b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
Fix accessibility focus bug in statusbar
2015-02-12 21:55:06 +00:00
Jim Miller
b2ff8d9a3e
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
2015-02-12 21:48:11 +00:00
Ruben Brunk
259f3d90b8
camera2: Fix legacy scaling factor application.
...
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
2015-02-12 13:27:26 -08:00
Luan Nguyen
fe2c687b97
am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
* commit '2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
2015-02-12 19:13:47 +00:00
Luan Nguyen
2ea209ab4c
am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
...
* commit '8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
2015-02-12 19:07:47 +00:00
Luan Nguyen
8d0df9b891
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
2015-02-12 19:01:03 +00:00
Jeremy Joslin
f456d4dcc0
am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
2015-02-12 18:34:03 +00:00
John Spurlock
f370177e94
NoMan: Initialize filter value reported to listeners.
...
In addition to relying on change callbacks.
Bug: 19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
2015-02-12 13:29:37 -05:00
Luan Nguyen
e0306bbece
am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
...
* commit 'e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-12 17:35:43 +00:00
Luan Nguyen
946bf2de30
am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
...
* commit 'b6de0316a8f77b4425057eb4e75f7375c47fad65':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-12 17:35:38 +00:00
Luan Nguyen
e726495a26
am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
...
* commit 'fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
docs: Fix issue with onCreate() method declaration in file backup section
2015-02-12 17:17:04 +00:00
Luan Nguyen
b6de0316a8
am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
...
* commit 'e1f90b4e1e438c0086409ae0253a6452f2befbac':
docs: Fix notification api guide issues (7461154, 12765600)
2015-02-12 17:16:59 +00:00
Luan Nguyen
fe5e7e92a1
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
2015-02-12 17:11:28 +00:00
Luan Nguyen
e1f90b4e1e
Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs
2015-02-12 17:10:50 +00:00
Benjamin Franz
40ab8bb229
am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
2015-02-12 16:45:06 +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
4fa3a80b6c
am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
...
* commit 'a5f301c7fb048461197a6032f66b35772a3157f9':
Legacy: Only set user surface dimensions on output surfaces
2015-02-12 05:39:05 +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
Jim Miller
959ea56f34
Fix accessibility focus bug in statusbar
...
The root view of the new uber statusbar should not be focusable.
Based on history, it looks like this was an oversight when this view
was refactored.
Fixes bug 19296202
Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4
2015-02-11 20:43:04 -08:00
Lorenzo Colitti
f99551d8a1
am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
...
* commit 'c7ccc393b470220710f566d447412d93f7f8d21b':
Make reportInetCondition revalidate if the report differs from our state
2015-02-12 02:43:03 +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
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
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
Luan Nguyen
e4b5387d62
docs: Fix issue with onCreate() method declaration in file backup section
...
bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
2015-02-11 11:38:41 -08:00
Luan Nguyen
14ec5fe09e
docs: Update device art generator to include Wear generic devices.
...
bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
2015-02-11 11:17:10 -08:00
Michael Wright
40bd8f416b
Merge "Stop active media projections on user switch." into lmp-mr1-dev
...
automerge: 3292c0e
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
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
00c8450d27
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
...
automerge: c38b90b
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
6b274720c5
GpsLocationProvider: Read data enabled status from TelephonyManager.
...
automerge: 64ce5f8
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
Leon Scroggins III
b296e4e0c2
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
...
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
(cherry picked from commit 89a2466a2a
2015-02-10 22:23:53 +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
