OSDN Git Service
Jason Sams [Fri, 20 Mar 2015 22:14:25 +0000 (22:14 +0000)]
Merge "unhide AllocationAdapter APIs"
Jason Sams [Fri, 20 Mar 2015 22:08:45 +0000 (15:08 -0700)]
unhide AllocationAdapter APIs
Change-Id: Id7ff10c7b09a5bedd9952602dd394e76b4fae8b1
Casey Ho [Fri, 20 Mar 2015 21:05:03 +0000 (21:05 +0000)]
Merge "Javadoc for ACTION_SCREEN_<ON|OFF> to indicate they cannot be registered in the manifest."
Adam Lesinski [Fri, 20 Mar 2015 20:46:39 +0000 (20:46 +0000)]
Merge "Output modified bcp47 tag in ResTable_config::toString()"
Adam Lesinski [Fri, 20 Mar 2015 20:46:02 +0000 (20:46 +0000)]
Merge "split-select: Languages should not be grouped exclusively"
Alan Viverette [Fri, 20 Mar 2015 20:37:51 +0000 (20:37 +0000)]
Merge "Only propagate state changes if wrapped drawable is stateful"
John Spurlock [Fri, 20 Mar 2015 20:20:08 +0000 (20:20 +0000)]
Merge "HUN: Implement per-package config."
Tim Kilbourn [Fri, 20 Mar 2015 18:46:19 +0000 (18:46 +0000)]
Merge "Add unique id to InputDevice."
Tim Kilbourn [Thu, 19 Mar 2015 23:02:02 +0000 (16:02 -0700)]
Add unique id to InputDevice.
If an input device driver assigns unique ids to devices (e.g., MAC
address), this method will be used to retrieve it from the device.
Change-Id: If1fd6643c5be7af5b989ef47f4bb653e7a63b6c6
Alan Viverette [Fri, 20 Mar 2015 18:08:46 +0000 (11:08 -0700)]
Only propagate state changes if wrapped drawable is stateful
Always update layer bounds if the contained drawable changed in any
way. Also adds null annotations in LayerDrawable and throws a more
useful exception when the layers argument is null.
Change-Id: Iae0cba68257e48b6a45fe081c3d4b0509d2dedd5
Adam Lesinski [Fri, 20 Mar 2015 18:07:23 +0000 (18:07 +0000)]
Merge "Disable WiFi energy data collection to avoid deadlock"
Winson Chung [Fri, 20 Mar 2015 16:59:58 +0000 (16:59 +0000)]
Merge "Fixing issue with screen-pinning for secondary users."
Rubin Xu [Tue, 3 Mar 2015 17:34:05 +0000 (17:34 +0000)]
Add DelegatedCertInstaller API in DPMS
Allow device/profile owner to delegate certificate APIs to third-party
certificate installer apps.
Bug:
19551274
Change-Id: Iaf9abb5ecb1dc0975fa98ea14408fe392d52fbf4
Lorenzo Colitti [Fri, 20 Mar 2015 08:29:25 +0000 (08:29 +0000)]
Merge changes Iddc971c7,If907f49f,I5505bd2c,I110b5800,I9aeb29c2, ...
* changes:
DHCP: Don't write options longer than 255 bytes.
DHCP: parsing robustness fixes.
DHCP: Add a hidden setting to use the legacy DHCP client.
DHCP: Add a Java DHCP client.
Add a protectFromVpn method that takes a FileDescriptor
DHCP: protocol changes.
DHCP: glue code.
DHCP: Ethernet/IP packet header changes.
DHCP: Minor cleanups to the packet code.
DHCP: Move the packet code to frameworks/base/services.
DHCP: Add a native method for making a DHCP socket.
DHCP: Add a superclass for DhcpStateMachine.
Add two utility methods for IPv4 netmasks.
Lorenzo Colitti [Tue, 17 Mar 2015 06:55:39 +0000 (15:55 +0900)]
DHCP: Don't write options longer than 255 bytes.
Change-Id: Iddc971c7ac97253af3063850cde3dee10c3829ff
Lorenzo Colitti [Tue, 17 Mar 2015 04:18:31 +0000 (13:18 +0900)]
DHCP: parsing robustness fixes.
1. Check the length of the fixed-length portions of the packet.
2. Catch BufferUnderflowException while parsing options.
Change-Id: If907f49f02a04a4a3360f46a3192e94ab099af0e
Lorenzo Colitti [Mon, 16 Mar 2015 14:46:24 +0000 (23:46 +0900)]
DHCP: Add a hidden setting to use the legacy DHCP client.
Change-Id: I5505bd2c20ddc895df0e9b176e1ed770ad74a3f4
Lorenzo Colitti [Mon, 9 Mar 2015 16:38:38 +0000 (01:38 +0900)]
DHCP: Add a Java DHCP client.
The behaviour of the client is intended to mirror the behaviour
of the current DhcpStateMachine + dhcpcd combination, except it
does not store leases across network changes.
Bug:
19704592
Change-Id: I110b58003da2d8293059d48a0181e16f7f7f145c
Lorenzo Colitti [Tue, 17 Mar 2015 08:56:10 +0000 (17:56 +0900)]
Add a protectFromVpn method that takes a FileDescriptor
Bug:
19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19
Lorenzo Colitti [Tue, 10 Mar 2015 15:01:25 +0000 (00:01 +0900)]
DHCP: protocol changes.
1. Define and add parsing code for MTU, max message size, T1, T2.
2. Add common TLVs (message size, hostname, vendor ID) to all
packets sent by the client.
3. Don't include requested IP and server ID in renew messages,
since the RFC says MUST NOT.
4. Don't hardcode the broadcast flag to true in DISCOVER packets,
use what the caller passed in.
5. Make some methods static.
Bug:
19704592
Change-Id: I42a0997e468b12e19cad9b403b98fe266e6cea73
Lorenzo Colitti [Tue, 10 Mar 2015 16:16:18 +0000 (01:16 +0900)]
DHCP: glue code.
1. Add a method to make a DhcpResults object from a DHCP packet.
2. Add a method to fetch the client MAC from the packet. This is
needed to check that the message is for us (lots of DHCP
messages are broadcast).
3. Add a length argument to the method that parses DHCP packets,
so the caller can use the same MTU-sized array all the time
instead of having to pass in a new array for every packet.
Bug:
19704592
Change-Id: I58223f5ec90fb5c762bc2934649e02f9122018b2
Lorenzo Colitti [Thu, 12 Mar 2015 13:36:49 +0000 (22:36 +0900)]
DHCP: Ethernet/IP packet header changes.
1. Support L2_ENCAP when building packets as well as when parsing.
2. Skip IP options when parsing DHCP packets.
Bug:
19704592
Change-Id: Ic27a45790ed1cf7cf5b82d63b6c0b64c909a570f
Lorenzo Colitti [Sat, 14 Mar 2015 04:52:18 +0000 (13:52 +0900)]
DHCP: Minor cleanups to the packet code.
1. Delete the DhcpStateMachine, since we don't plan to use it.
2. Make all InetAddresses Inet4Addresses, since that's what they
are. In order to do this, define INADDR_ANY and
INADDR_BROADCAST, constants, since Inet4Address.{ANY,ALL} are
not Inet4Addresses but InetAddresses.
Bug:
19704592
Change-Id: I5a0499be889076992a60aaad0bd8be5ea66bd560
Lorenzo Colitti [Mon, 9 Mar 2015 16:36:14 +0000 (01:36 +0900)]
DHCP: Move the packet code to frameworks/base/services.
There's no need for it to be in frameworks/base/core, since it
will only be used by services.
Bug:
19704592
Change-Id: I2f5277eca848b7000ca46db575e8602eacb5c8bd
Lorenzo Colitti [Fri, 6 Mar 2015 10:57:39 +0000 (19:57 +0900)]
DHCP: Add a native method for making a DHCP socket.
Bug:
19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be
Lorenzo Colitti [Tue, 10 Mar 2015 14:59:36 +0000 (23:59 +0900)]
DHCP: Add a superclass for DhcpStateMachine.
This can be used to switch between different DHCP client
implementations. The caller can declare objects of type
BaseDhcpStateMachine, and call its methods, without needing to
care what implementation is in use.
Bug:
19704592
Change-Id: Icefad9b0d0f83b349681388b1fa16b5e2e37c042
Lorenzo Colitti [Mon, 9 Mar 2015 16:32:40 +0000 (01:32 +0900)]
Add two utility methods for IPv4 netmasks.
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.
Bug:
19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
Jinsuk Kim [Fri, 20 Mar 2015 04:28:16 +0000 (04:28 +0000)]
Merge "CEC: Expose API sendStandby()"
John Spurlock [Wed, 18 Mar 2015 23:21:54 +0000 (19:21 -0400)]
HUN: Implement per-package config.
- Keep track of whether or not HUNs are allowed per-package.
- No impact on ranking, purely presentational.
- Simplify RankingHelper with a package table.
- Improve RankingHelper dump.
- Fix some warnings and typos.
Bug:
19776495
Change-Id: I28d69df69b576f4eabbb528eabecb1f736f0e830
Adam Lesinski [Fri, 20 Mar 2015 01:10:16 +0000 (18:10 -0700)]
Disable WiFi energy data collection to avoid deadlock
This is a temporary fix to prevent deadlocking in the
system. Need to come up with a better solution for
accessing WiFi and other subsystems from BatteryStats.
b/
19729960
Change-Id: I464e7490c9780249d2a3eef05ce084a7d84372c0
Jinsuk Kim [Wed, 18 Mar 2015 01:52:13 +0000 (10:52 +0900)]
CEC: Expose API sendStandby()
Allows playback/TV device to use the API to turn off
TV/other device that accepts the command.
Bug:
19802768
Change-Id: I6440626c08efb1473bea5ab577e571d0bb92d4a1
Phil Burk [Fri, 20 Mar 2015 00:28:30 +0000 (00:28 +0000)]
Merge "AudioService: fix String cast crash when mediaserver killed"
Vladislav Kaznacheev [Fri, 20 Mar 2015 00:15:42 +0000 (00:15 +0000)]
Merge "Start respecting View.DRAG_FLAG_GLOBAL flag."
Phil Burk [Thu, 19 Mar 2015 22:32:24 +0000 (15:32 -0700)]
AudioService: fix String cast crash when mediaserver killed
Bug:
19847028
Change-Id: I45668fbd08e87df69fe3867473a09c387589ca8a
Signed-off-by: Phil Burk <philburk@google.com>
Zach Riggle [Thu, 19 Mar 2015 23:50:59 +0000 (23:50 +0000)]
am
685d33dd: am
104a29b6: am
a7dbe970: am
901e4008: am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
685d33dd18aba2c9ceb7586a638ec7850c1872a7':
Fix NPE in FlashlightController
Zach Riggle [Thu, 19 Mar 2015 23:42:58 +0000 (23:42 +0000)]
am
104a29b6: am
a7dbe970: am
901e4008: am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
104a29b6b5fe6e454787053ca72950dbbc4d424b':
Fix NPE in FlashlightController
Yang Ni [Thu, 19 Mar 2015 23:42:34 +0000 (23:42 +0000)]
am
53699ec6: am
d3e6428a: Merge "New API methods for Script Group"
* commit '
53699ec613acf76277b69db57bf2f378d0dc374a':
New API methods for Script Group
Zach Riggle [Thu, 19 Mar 2015 23:35:20 +0000 (23:35 +0000)]
am
a7dbe970: am
901e4008: am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
Fix NPE in FlashlightController
Yang Ni [Thu, 19 Mar 2015 23:35:14 +0000 (23:35 +0000)]
am
d3e6428a: Merge "New API methods for Script Group"
* commit '
d3e6428aea34ce3297123c63b4dd6223dac5d5a8':
New API methods for Script Group
Craig Mautner [Thu, 19 Mar 2015 23:31:50 +0000 (23:31 +0000)]
Merge "Fix bad nesting count when remote calls fail."
Chris Craik [Thu, 19 Mar 2015 23:29:57 +0000 (23:29 +0000)]
Merge "Avoid throwing ISE in Canvas#restore underflow"
Zach Riggle [Thu, 19 Mar 2015 23:29:06 +0000 (23:29 +0000)]
am
901e4008: am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
901e400826e76f0eaa9d05cca20c1696bf86db67':
Fix NPE in FlashlightController
smain@google.com [Thu, 19 Mar 2015 23:27:14 +0000 (23:27 +0000)]
am
62c595aa: am
6784cf99: am
092a7893: am
d5fdc287: am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
62c595aaee29d88c7ae0694f8aeb83179f33150c':
add Places API to the Location feature page
Zach Riggle [Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)]
am
a6e7a9b5: am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
a6e7a9b50d0866fac57447496e4207d91c68c806':
Fix NPE in FlashlightController
Yang Ni [Thu, 19 Mar 2015 23:21:27 +0000 (23:21 +0000)]
Merge "New API methods for Script Group"
Zach Riggle [Thu, 19 Mar 2015 23:15:02 +0000 (23:15 +0000)]
am
6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
* commit '
6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
Fix NPE in FlashlightController
Zach Riggle [Thu, 19 Mar 2015 23:09:31 +0000 (23:09 +0000)]
Merge "Fix NPE in FlashlightController" into lmp-dev
Dianne Hackborn [Thu, 19 Mar 2015 23:05:15 +0000 (23:05 +0000)]
Merge "First stab at device idle mode."
smain@google.com [Thu, 19 Mar 2015 22:55:38 +0000 (22:55 +0000)]
am
6784cf99: am
092a7893: am
d5fdc287: am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
6784cf9945e01de63f67ed11a4925fa9879f2073':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:48:07 +0000 (22:48 +0000)]
am
092a7893: am
d5fdc287: am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
092a7893779455ca9d1a0ff34d9ccefb9ae709db':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:42:44 +0000 (22:42 +0000)]
am
d5fdc287: am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
d5fdc2870079876cd5d8407773aa73225a12c044':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:35:16 +0000 (22:35 +0000)]
am
3bc84b18: am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
3bc84b18b74cd14d98c81ea263b3ca49549a590c':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:29:09 +0000 (22:29 +0000)]
am
910ca415: am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
910ca415587c6b7f7a004cc381c36352c021c12b':
add Places API to the Location feature page
Bo Liu [Thu, 19 Mar 2015 22:28:03 +0000 (22:28 +0000)]
Merge "Remove debug logging from WebView"
smain@google.com [Thu, 19 Mar 2015 22:22:10 +0000 (22:22 +0000)]
am
4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
* commit '
4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
add Places API to the Location feature page
smain@google.com [Thu, 19 Mar 2015 22:16:11 +0000 (22:16 +0000)]
Merge "add Places API to the Location feature page" into lmp-docs
Chris Craik [Thu, 19 Mar 2015 22:11:36 +0000 (15:11 -0700)]
Avoid throwing ISE in Canvas#restore underflow
bug:
19829784
Change-Id: I5829a7783ad912c09c83dee17bad10b90f42aace
Paul Mclean [Thu, 19 Mar 2015 22:02:41 +0000 (22:02 +0000)]
Merge "AudioService: fix crash when mediaserver killed"
Phil Burk [Thu, 19 Mar 2015 21:59:20 +0000 (14:59 -0700)]
AudioService: fix crash when mediaserver killed
Bug:
19847028
Change-Id: I4acacd8a6d20317d180a6994158abc0b2957280c
Signed-off-by: Phil Burk <philburk@google.com>
Yang Ni [Thu, 19 Mar 2015 21:47:31 +0000 (21:47 +0000)]
am
f2ea0171: am
c077ee31: Merge "Added copyright notice and formatted to convention"
* commit '
f2ea01717b918471b050bea46529e1843d36fc84':
Added copyright notice and formatted to convention
Yang Ni [Thu, 19 Mar 2015 21:41:59 +0000 (21:41 +0000)]
am
c077ee31: Merge "Added copyright notice and formatted to convention"
* commit '
c077ee316e0f6f50ade552f51ae657a08e423eaa':
Added copyright notice and formatted to convention
Yang Ni [Wed, 11 Mar 2015 23:25:37 +0000 (16:25 -0700)]
New API methods for Script Group
Use a single vararg Object array for both kernel/invoke arguments
and global bindings. The assumption is that global bindings are in
the end after the kernel/invoke arguments.
This simplifies the api to add a kernel or invoke to a script group.
Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2
Bryce Lee [Thu, 19 Mar 2015 21:37:45 +0000 (21:37 +0000)]
am
b45d3926: am
8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
* commit '
b45d3926f327948c486c92ddc7fdb97dbc98e401':
Fix wrong intent being passed in PhoneWindowManager.
Bryce Lee [Thu, 19 Mar 2015 21:30:43 +0000 (21:30 +0000)]
am
8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
* commit '
8320cf2de357265179c3007256394b0cbb69d949':
Fix wrong intent being passed in PhoneWindowManager.
Yang Ni [Thu, 19 Mar 2015 21:28:13 +0000 (21:28 +0000)]
Merge "Added copyright notice and formatted to convention"
Bryce Lee [Thu, 19 Mar 2015 21:24:51 +0000 (21:24 +0000)]
Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
Bo Liu [Thu, 19 Mar 2015 20:48:09 +0000 (13:48 -0700)]
Remove debug logging from WebView
Moving them to chromium:
https://codereview.chromium.org/
1022993002/
Change-Id: I6a9294b7041e9768397a624e5c174b22f4085e87
Guang Zhu [Thu, 19 Mar 2015 21:14:14 +0000 (21:14 +0000)]
Merge "pass stream contents in separate thread for executeShellCommand"
Winson Chung [Thu, 19 Mar 2015 21:11:27 +0000 (14:11 -0700)]
Fixing issue with screen-pinning for secondary users.
- Proxy the screen pinning request to the SystemUI for the primary user.
Bug:
19395305
Change-Id: I6252d4ee05b2bea4e76b2a4d0b903e2866fffa76
Joe Fernandez [Thu, 19 Mar 2015 21:04:19 +0000 (21:04 +0000)]
am
33e84c16: am
8ca83e05: am
0362d6e0: am
bb777ef4: am
b88bce21: am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
33e84c167863745514b56b97c391f8d8913ca05e':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 21:04:12 +0000 (21:04 +0000)]
am
58273493: am
1e81b070: am
e41abf4a: am
43929db6: am
f761e4c2: am
d91167e8: am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK re
* commit '
5827349328bd3f647c55ba271ec4f87e96a25ced':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 21:04:03 +0000 (21:04 +0000)]
am
b89cdf1e: am
5c1a3ab4: am
d7df900a: am
a06c8ff0: am
36b2c160: am
bacdd2b8: am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
b89cdf1ef452db6f21a94c8e122091b74833e3f3':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Joe Fernandez [Thu, 19 Mar 2015 20:56:45 +0000 (20:56 +0000)]
am
8ca83e05: am
0362d6e0: am
bb777ef4: am
b88bce21: am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
8ca83e0504cb3b8d78c1a07bd49a73c58433671b':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:56:33 +0000 (20:56 +0000)]
am
1e81b070: am
e41abf4a: am
43929db6: am
f761e4c2: am
d91167e8: am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" int
* commit '
1e81b070f772fdef45d7bedc0de0304603e05a95':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 20:56:25 +0000 (20:56 +0000)]
am
5c1a3ab4: am
d7df900a: am
a06c8ff0: am
36b2c160: am
bacdd2b8: am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
5c1a3ab4216333696947eefee4d022f708e4c053':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Miao Wang [Thu, 19 Mar 2015 20:54:40 +0000 (20:54 +0000)]
am
f8a69f56: am
2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
* commit '
f8a69f562b7f1c987b5eddd2ee13c04c1a787625':
[RenderScript] Remove duplicate include in jni
Eric Gilmore [Thu, 19 Mar 2015 20:54:31 +0000 (20:54 +0000)]
am
3e90fa59: am
680f36a8: am
66e529aa: am
1f07cfb6: am
0fdeefbd: am
cf1586d3: am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
* commit '
3e90fa590857e43f0ed86eac18f0b02afca44b88':
Changes for a quick, pre-migration bug sprint:
Joe Fernandez [Thu, 19 Mar 2015 20:49:52 +0000 (20:49 +0000)]
am
0362d6e0: am
bb777ef4: am
b88bce21: am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
0362d6e0c836cd48beb928f053d97dcc3961c110':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:49:48 +0000 (20:49 +0000)]
am
e41abf4a: am
43929db6: am
f761e4c2: am
d91167e8: am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
* commit '
e41abf4a304675bda37de7b796258f7f322d61ea':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 20:49:41 +0000 (20:49 +0000)]
am
d7df900a: am
a06c8ff0: am
36b2c160: am
bacdd2b8: am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
d7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Miao Wang [Thu, 19 Mar 2015 20:49:15 +0000 (20:49 +0000)]
am
2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
* commit '
2ef9955c827e0348a65b4f787e206925f4663197':
[RenderScript] Remove duplicate include in jni
Eric Gilmore [Thu, 19 Mar 2015 20:46:28 +0000 (20:46 +0000)]
am
680f36a8: am
66e529aa: am
1f07cfb6: am
0fdeefbd: am
cf1586d3: am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
* commit '
680f36a88ff1c43e928066122505ec05c50d9942':
Changes for a quick, pre-migration bug sprint:
Joe Fernandez [Thu, 19 Mar 2015 20:42:36 +0000 (20:42 +0000)]
am
bb777ef4: am
b88bce21: am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
bb777ef40d7a181e782dfce652c3d9da390dc9f5':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:42:30 +0000 (20:42 +0000)]
am
43929db6: am
f761e4c2: am
d91167e8: am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
* commit '
43929db6487f295c4bca1a499a5299da77ad2161':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 20:42:23 +0000 (20:42 +0000)]
am
a06c8ff0: am
36b2c160: am
bacdd2b8: am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Eric Gilmore [Thu, 19 Mar 2015 20:38:49 +0000 (20:38 +0000)]
am
66e529aa: am
1f07cfb6: am
0fdeefbd: am
cf1586d3: am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
* commit '
66e529aa34034d044c496c330ba89026ee293253':
Changes for a quick, pre-migration bug sprint:
Miao Wang [Thu, 19 Mar 2015 20:35:55 +0000 (20:35 +0000)]
Merge "[RenderScript] Remove duplicate include in jni"
Joe Fernandez [Thu, 19 Mar 2015 20:35:09 +0000 (20:35 +0000)]
am
b88bce21: am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
b88bce219abf7fcad50ac105183bd79da0b9893c':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:35:05 +0000 (20:35 +0000)]
am
f761e4c2: am
d91167e8: am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
* commit '
f761e4c20ee63873043522990487ecd15bb18966':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 20:34:59 +0000 (20:34 +0000)]
am
36b2c160: am
bacdd2b8: am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
36b2c1609d17317bb9d3977e46ada21275f54d65':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Eric Gilmore [Thu, 19 Mar 2015 20:32:03 +0000 (20:32 +0000)]
am
1f07cfb6: am
0fdeefbd: am
cf1586d3: am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
* commit '
1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
Changes for a quick, pre-migration bug sprint:
Joe Fernandez [Thu, 19 Mar 2015 20:28:54 +0000 (20:28 +0000)]
am
c773358d: am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
c773358d599d9dd7716db88b0699a7903d64ad9b':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:28:45 +0000 (20:28 +0000)]
am
d91167e8: am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
* commit '
d91167e8ceda64809e9afd73ac184dc319a276f5':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 20:28:40 +0000 (20:28 +0000)]
am
bacdd2b8: am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Bryce Lee [Thu, 19 Mar 2015 20:27:26 +0000 (13:27 -0700)]
Fix wrong intent being passed in PhoneWindowManager.
When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.
Bug:
19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f
Eric Gilmore [Thu, 19 Mar 2015 20:24:57 +0000 (20:24 +0000)]
am
0fdeefbd: am
cf1586d3: am
e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
* commit '
0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
Changes for a quick, pre-migration bug sprint:
Joe Fernandez [Thu, 19 Mar 2015 20:21:47 +0000 (20:21 +0000)]
am
dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
* commit '
dd461b298834d7582a98a69c164fe1e3b63c81b9':
RESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 20:21:43 +0000 (20:21 +0000)]
am
80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs
* commit '
80f947c8b41d732bc1f8ca4c36df11a395dc9248':
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
Joe Fernandez [Thu, 19 Mar 2015 20:21:37 +0000 (20:21 +0000)]
am
ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""" into lmp-docs
* commit '
ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #
1784785.""
Rich Slogar [Thu, 19 Mar 2015 20:17:37 +0000 (20:17 +0000)]
am
a29a34b0: am
efa9bfac: am
e3d92a20: am
983dd1a9: am
b569ec3c: am
d76aa14c: am
d5885842: Merge "docs: proguard help update" into lmp-docs
* commit '
a29a34b0540a895c75f6d516ec4cc9860be6253d':
docs: proguard help update
OSDN Git Service
