OSDN Git Service
Andrew Solovay [Thu, 19 Mar 2015 18:30:59 +0000 (18:30 +0000)]
am
cf34a6d1: am
46bda6a4: am
6fd36f11: am
ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
automerge:
7a98f83
* commit '
7a98f832dc01671b8acc128b01ea87c20595f781':
docs: Fixed typo (spurious quotation mark).
Andrew Solovay [Thu, 19 Mar 2015 18:30:43 +0000 (18:30 +0000)]
am
a0141748: am
42f966c9: am
dbec5ae6: am
0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
automerge:
8973063
* commit '
89730636985c745055671f077514963744e1aeb8':
docs: Fixed broken image link, and broke long lines in code samples
Jan Nordqvist [Thu, 19 Mar 2015 17:09:08 +0000 (17:09 +0000)]
Merge "More fixes to get passpoint working" into m-wireless-dev
John Reck [Thu, 19 Mar 2015 14:31:18 +0000 (14:31 +0000)]
Merge "Fix setSurfaceTexture to handle surface caching" into m-wireless-dev
Paul Jensen [Thu, 19 Mar 2015 12:07:24 +0000 (12:07 +0000)]
Merge "Remove dead code, mostly DataStateTracker." into m-wireless-dev
Wei Wang [Thu, 19 Mar 2015 05:02:09 +0000 (05:02 +0000)]
Merge "Make Opportunistic Scan API public." into m-wireless-dev
Bart Sears [Thu, 19 Mar 2015 02:58:59 +0000 (02:58 +0000)]
am
c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
automerge:
dd985c2
* commit '
dd985c21dd4f5957e8d6e052976623d127e8f090':
Prevent activities from being started during setup wizard.
Dan Sandler [Thu, 19 Mar 2015 02:58:41 +0000 (02:58 +0000)]
am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
automerge:
1ac28e1
* commit '
1ac28e18b417b286f05a44712acb1d5f00b56fb3':
Avoid crashing on corrupted notifications.
Rich Slogar [Thu, 19 Mar 2015 02:58:33 +0000 (02:58 +0000)]
am
8d3f587f: am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
automerge:
455b64c
* commit '
455b64c57f06bace3f85dce1a30064bd66dd2385':
docs: downloads for sdk 24.1.2
Pierre Vandwalle [Thu, 19 Mar 2015 02:58:01 +0000 (02:58 +0000)]
Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
automerge:
7c39808
* commit '
7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
export API to disable autojoin scan initial implementation
Andrew Solovay [Thu, 19 Mar 2015 01:17:17 +0000 (01:17 +0000)]
am
cf34a6d1: am
46bda6a4: am
6fd36f11: am
ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
* commit '
cf34a6d1a19853fe156bf14abcb40a01a380de79':
docs: Fixed typo (spurious quotation mark).
Andrew Solovay [Thu, 19 Mar 2015 01:17:11 +0000 (01:17 +0000)]
am
a0141748: am
42f966c9: am
dbec5ae6: am
0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
* commit '
a01417485279a486df31f8666b037b6f15d7f935':
docs: Fixed broken image link, and broke long lines in code samples
Andrew Solovay [Thu, 19 Mar 2015 00:55:08 +0000 (00:55 +0000)]
am
46bda6a4: am
6fd36f11: am
ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
* commit '
46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
docs: Fixed typo (spurious quotation mark).
Andrew Solovay [Thu, 19 Mar 2015 00:55:01 +0000 (00:55 +0000)]
am
42f966c9: am
dbec5ae6: am
0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
* commit '
42f966c9df6ed4e7903e87ad557d63ed81da2986':
docs: Fixed broken image link, and broke long lines in code samples
Vinit Deshpande [Thu, 19 Mar 2015 00:00:30 +0000 (17:00 -0700)]
More fixes to get passpoint working
Change-Id: If8639bb0fd3bdaad7ee09217a9152c1695cb9354
Wei Wang [Wed, 18 Mar 2015 23:38:08 +0000 (16:38 -0700)]
Make Opportunistic Scan API public.
Change-Id: I47da0f7e385f0a72815e493852283a44370aa1ce
Naveen Kalla [Tue, 17 Mar 2015 22:20:53 +0000 (15:20 -0700)]
Fix setSurfaceTexture to handle surface caching
TextureView contains its surfaceTexture (i.e. mSurface)
and its OnFrameAvailableListener(i.e. mUpdateListener).
In order to apply a cached/pre-existing SurfaceTexture s1 to a
TextureView, if we call TextureView.setSurfaceTexture(s1),
the OnFrameAvailableListener of s1 should get set to mUpdateListener
of TextureView since the mSurface has been updated.
The existing code doesn't apply this and causes the frames to not be
updated on a TextureView that uses setSurfaceTexture.
This change fixes setSurfaceTexture method by setting s1's
OnFrameAvailableListener to mUpdateListener.
Change-Id: I4c1a704c587e977ab7a6b1fe3a7d3e0d20d00218
Pierre Vandwalle [Mon, 16 Mar 2015 18:31:47 +0000 (11:31 -0700)]
add BASE_WIFI_LOGGER to system protocol messages
Change-Id: I4bb59b220208d5cb4fa415ad092970312392d8e4
Andrew Solovay [Wed, 18 Mar 2015 22:44:24 +0000 (22:44 +0000)]
am
6fd36f11: am
ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
* commit '
6fd36f11bee008dae92ed312e4a8291417e6e93f':
docs: Fixed typo (spurious quotation mark).
Andrew Solovay [Wed, 18 Mar 2015 22:44:09 +0000 (22:44 +0000)]
am
dbec5ae6: am
0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
* commit '
dbec5ae69a8bcf10cfd6d483356d0fb904b73290':
docs: Fixed broken image link, and broke long lines in code samples
Andrew Solovay [Wed, 18 Mar 2015 22:35:49 +0000 (22:35 +0000)]
am
ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
* commit '
ae279bd5b03f472d4bd1427365009269db9fe5e3':
docs: Fixed typo (spurious quotation mark).
Andrew Solovay [Wed, 18 Mar 2015 22:35:45 +0000 (22:35 +0000)]
am
0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
* commit '
0aef0abf3d3366c09a89d3132ff2ce5979988fc1':
docs: Fixed broken image link, and broke long lines in code samples
xinhe [Fri, 13 Mar 2015 01:43:05 +0000 (18:43 -0700)]
Change rtt Framework interface
Bug:
19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
Andrew Solovay [Wed, 18 Mar 2015 22:26:04 +0000 (22:26 +0000)]
Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs
Andrew Solovay [Wed, 18 Mar 2015 22:23:10 +0000 (22:23 +0000)]
Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
Bart Sears [Wed, 18 Mar 2015 20:30:15 +0000 (20:30 +0000)]
am
c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
* commit '
c2eb5c602d36d91483c8f24b0c6859e4283724b4':
Prevent activities from being started during setup wizard.
Bart Sears [Wed, 18 Mar 2015 20:21:57 +0000 (20:21 +0000)]
Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
Tyler Gunn [Wed, 18 Mar 2015 20:09:14 +0000 (13:09 -0700)]
resolve merge conflicts of
bcb17eb to m-wireless-dev.
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
Brian Carlstrom [Wed, 18 Mar 2015 19:08:26 +0000 (19:08 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
automerge:
6a6cf63
* commit '
6a6cf634f527cdde9382e8fabb4de5aaad748879':
Update vmSafeMode documentation
Pavel Zhamaitsiak [Wed, 18 Mar 2015 19:08:18 +0000 (19:08 +0000)]
Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev
automerge:
1d33a37
* commit '
1d33a37e0591b27386db2d324313e601cef42527':
Add format string for displaying SPN in Wi-Fi calling mode.
Deepanshu Gupta [Wed, 18 Mar 2015 19:08:09 +0000 (19:08 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
automerge:
579535a
* commit '
579535acfa1c5c093b5152cf6f20603b273137be':
Fix AppCompat action bar theming.
Deepanshu Gupta [Wed, 18 Mar 2015 19:08:01 +0000 (19:08 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
automerge:
cc5c1a5
* commit '
cc5c1a57b05b2cda45936172bbe91a52ae9adee6':
Fix NoActionBar themes rendering.
Luan Nguyen [Wed, 18 Mar 2015 19:07:53 +0000 (19:07 +0000)]
am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
automerge:
7962ae3
* commit '
7962ae36eb8be221753f2b3c75bdb676beda938c':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Craig Mautner [Wed, 18 Mar 2015 19:07:44 +0000 (19:07 +0000)]
am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
automerge:
c5ee610
* commit '
c5ee610da5e3732e38e7e15d684c455eb6131279':
Correct docs to specify leading slash in paths.
Nathan Harold [Wed, 18 Mar 2015 19:07:35 +0000 (19:07 +0000)]
Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
automerge:
8ee14a2
* commit '
8ee14a244851ac80af0193541a5d521462d75e1e':
Adding hidden isWifiCallingEnabled() and isVolteEnabled()
Vinit Deshpande [Wed, 18 Mar 2015 18:43:35 +0000 (18:43 +0000)]
Merge "Fix scan results to hold passpoint data" into m-wireless-dev
Dan Sandler [Wed, 18 Mar 2015 18:28:31 +0000 (18:28 +0000)]
am
b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit '
b3a1b6632e403926fed995e851a8e44fc944c663':
Avoid crashing on corrupted notifications.
Dan Sandler [Wed, 18 Mar 2015 18:23:19 +0000 (18:23 +0000)]
Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
Rich Slogar [Wed, 18 Mar 2015 17:35:02 +0000 (17:35 +0000)]
am
8d3f587f: am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
8d3f587f15016d193e4739e3893b77e11336b498':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:27:29 +0000 (17:27 +0000)]
am
57c24fbb: am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
57c24fbb90dd7b342b06e2daecc1033f92d730da':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:20:51 +0000 (17:20 +0000)]
am
2fc33a00: am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
2fc33a008c02cf408e1d270972bbf681c7a36785':
docs: downloads for sdk 24.1.2
Rich Slogar [Wed, 18 Mar 2015 17:13:55 +0000 (17:13 +0000)]
am
ddc44153: docs: downloads for sdk 24.1.2
* commit '
ddc44153295174e8195286c21d7edcd3962b3661':
docs: downloads for sdk 24.1.2
Paul Jensen [Wed, 18 Mar 2015 16:29:13 +0000 (12:29 -0400)]
Remove dead code, mostly DataStateTracker.
(cherry picked from AOSP commit
7fad4eb4b52bc6c7ddad47f70e0c310093fbde3b)
Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058
Rich Slogar [Wed, 18 Mar 2015 00:19:07 +0000 (17:19 -0700)]
docs: downloads for sdk 24.1.2
b.android 160727
Change-Id: I112badc736ce4b85fabe0b702a2b24800ee589bd
Erik Kline [Wed, 18 Mar 2015 00:18:40 +0000 (00:18 +0000)]
Merge "Fix missing printf argument." into m-wireless-dev
Vinit Deshpande [Fri, 13 Mar 2015 00:04:35 +0000 (17:04 -0700)]
Fix scan results to hold passpoint data
Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
Vinit Deshpande [Wed, 18 Mar 2015 00:06:49 +0000 (00:06 +0000)]
Merge "Improve passpoint configuration validation" into m-wireless-dev
Erik Kline [Tue, 17 Mar 2015 23:08:57 +0000 (08:08 +0900)]
Fix missing printf argument.
Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7
Pierre Vandwalle [Tue, 17 Mar 2015 22:29:30 +0000 (22:29 +0000)]
Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev
Dong Zhou [Tue, 17 Mar 2015 22:21:21 +0000 (22:21 +0000)]
am
89f41eb3: Define the capability to speed up MT call audio
* commit '
89f41eb39e910e220957ac861651ead17eff9085':
Define the capability to speed up MT call audio
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio
Bug:
19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
Wei Wang [Tue, 13 Jan 2015 04:02:37 +0000 (20:02 -0800)]
Add opportunistic ble scan mode. (1/2)
Bug:
19003667
Change-Id: Ibed7e9ec604cb11a58736d168d3d19ece53fc77a
(cherry picked from commit
7508ddf8b53bf350a3424ef71f1ce62ea17006b8)
Brian Carlstrom [Tue, 17 Mar 2015 19:29:38 +0000 (19:29 +0000)]
am
97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
* commit '
97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
Update vmSafeMode documentation
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Pavel Zhamaitsiak [Tue, 17 Mar 2015 18:28:34 +0000 (18:28 +0000)]
Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev
Dan Sandler [Wed, 25 Feb 2015 18:20:39 +0000 (13:20 -0500)]
Avoid crashing on corrupted notifications.
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.
Bug:
19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:36 +0000 (14:28 +0000)]
am
1f9a26af: am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
1f9a26af95abba385b612c734d1d5e32d9e3f363':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:28:32 +0000 (14:28 +0000)]
am
9a00f1c8: am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
9a00f1c84b7a7936a12415a08604ac8fb98ec5ea':
Fix NoActionBar themes rendering.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:50 +0000 (14:16 +0000)]
am
158c08bc: am
ada85905: Fix AppCompat action bar theming.
* commit '
158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 14:16:42 +0000 (14:16 +0000)]
am
79f7fce7: am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
Fix NoActionBar themes rendering.
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
Deepanshu Gupta [Tue, 17 Mar 2015 00:21:02 +0000 (00:21 +0000)]
am
ada85905: Fix AppCompat action bar theming.
* commit '
ada8590547348b77d8cbd56abdb8fadb3e72c015':
Fix AppCompat action bar theming.
Deepanshu Gupta [Tue, 17 Mar 2015 00:20:58 +0000 (00:20 +0000)]
am
2e4d9324: Fix NoActionBar themes rendering.
* commit '
2e4d93245764a1c1d7515361ddbb8fc1665f814e':
Fix NoActionBar themes rendering.
Vinit Deshpande [Thu, 12 Mar 2015 00:43:04 +0000 (17:43 -0700)]
Improve passpoint configuration validation
Change-Id: I717242b2f8b2e7d0f84c3a7c74c4672289387151
Deepanshu Gupta [Fri, 13 Mar 2015 18:06:47 +0000 (11:06 -0700)]
Fix AppCompat action bar theming.
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.
- Set project callback when LayoutInflater is created by
LayoutInflater.from(context).
- Remove duplication of code to get base context from context wrapper.
Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
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 [Mon, 16 Mar 2015 12:12:41 +0000 (12:12 +0000)]
Merge changes from topic 'dhcpclient' into m-wireless-dev
* 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.
Lorenzo Colitti [Mon, 16 Mar 2015 12:11:37 +0000 (12:11 +0000)]
Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev
Paul Jensen [Mon, 16 Mar 2015 11:59:02 +0000 (11:59 +0000)]
Merge "Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK." into m-wireless-dev
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
Michael Wright [Thu, 12 Mar 2015 23:23:05 +0000 (16:23 -0700)]
Prevent activities from being started during setup wizard.
Bug:
19677145
Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
Deepanshu Gupta [Fri, 13 Mar 2015 01:46:36 +0000 (18:46 -0700)]
Fix NoActionBar themes rendering.
Also fix some warnings.
Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
Pierre Vandwalle [Fri, 13 Mar 2015 20:58:53 +0000 (13:58 -0700)]
export API to disable autojoin scan initial implementation
Change-Id: I28e268dd8b859a3a22c3d6f699216bbd7124af26
Andrew Solovay [Fri, 13 Mar 2015 20:52:04 +0000 (13:52 -0700)]
docs: Fixed typo (spurious quotation mark).
See first comment for stage location.
bug:
18612085
Change-Id: I4c29a087621d1c62596838d30b2654ee136cecd1
Prerepa Viswanadham [Fri, 13 Mar 2015 20:05:42 +0000 (20:05 +0000)]
Merge "Per controller tx/rx/idle current values - to be populated in device overlays" into m-wireless-dev
Prerepa Viswanadham [Thu, 5 Feb 2015 19:46:05 +0000 (11:46 -0800)]
Per controller tx/rx/idle current values - to be populated in
device overlays
Change-Id: Ib49d2ecc1bcc52ab76d16f236ab54cf5ec5d9864
Andrew Solovay [Fri, 13 Mar 2015 18:45:24 +0000 (11:45 -0700)]
docs: Fixed broken image link, and broke long lines in code samples
While I had gridview open (per the bug), I also checked the other
files in that directory for broken image links (in case this stemmed
from a doc reorg). I didn't find any broken images, but I did find
a couple of code samples that unnecessarily had horizontal scroll
bars, so I fixed those.
See first comment for doc stage location.
bug:
19611361
Change-Id: I983a09aaee5e2b1747376748c1aa46341c31a3c2
Pavel Zhamaitsiak [Thu, 12 Mar 2015 00:09:13 +0000 (17:09 -0700)]
Add format string for displaying SPN in Wi-Fi calling mode.
Bug:
19681794
Change-Id: I31feab956d14accda73288cd43a2aa34db7175ae
Luan Nguyen [Fri, 13 Mar 2015 18:28:32 +0000 (18:28 +0000)]
am
0d756f7d: am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
0d756f7d5646f84753a3db5f702f4ac79bda22bf':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 18:13:39 +0000 (18:13 +0000)]
am
217a4356: am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
217a435665880076abb71085e9d76aec4ff83b6d':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Paul Jensen [Fri, 13 Mar 2015 18:06:12 +0000 (14:06 -0400)]
Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620
Luan Nguyen [Fri, 13 Mar 2015 17:57:02 +0000 (17:57 +0000)]
am
a8bdd2f3: am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
a8bdd2f341ded0f2096e2750d176873e3e9e89c7':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 17:49:46 +0000 (17:49 +0000)]
am
42bb44db: Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
* commit '
42bb44dbf5bffc5d3fcf89eacfd5c561dbe8095c':
docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit
Luan Nguyen [Fri, 13 Mar 2015 17:42:04 +0000 (17:42 +0000)]
Merge "docs: Remove deprecated Fitness information from this doc. Guides have been moved to developers.google.com/fit" into lmp-docs
Craig Mautner [Fri, 13 Mar 2015 00:38:53 +0000 (00:38 +0000)]
am
98560bdf: am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
98560bdf87ad5f97054b13d3c92954132584c7f7':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:29:21 +0000 (00:29 +0000)]
am
bfcc60a3: am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
bfcc60a3f03ff25dccb5277626da213b1e254ccd':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:22:33 +0000 (00:22 +0000)]
am
2825a9c6: am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
2825a9c618840c1cf3d59806a794674f12a7c7c6':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:17:36 +0000 (00:17 +0000)]
am
470ad0fa: Merge "Correct docs to specify leading slash in paths." into lmp-docs
* commit '
470ad0fa1c0a4047c0a4c3d132a9ec3106e447ba':
Correct docs to specify leading slash in paths.
Craig Mautner [Fri, 13 Mar 2015 00:09:30 +0000 (00:09 +0000)]
Merge "Correct docs to specify leading slash in paths." into lmp-docs
Nathan Harold [Thu, 12 Mar 2015 21:37:44 +0000 (21:37 +0000)]
Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
OSDN Git Service
