OSDN Git Service
Scott Main [Sat, 14 Sep 2013 01:03:18 +0000 (18:03 -0700)]
am
a23fd887: more javadocs for onTrimMemory()
* commit '
a23fd88729bd10c02a9d631c9954616b3a1d0f6f':
more javadocs for onTrimMemory()
Scott Main [Thu, 15 Aug 2013 20:53:31 +0000 (13:53 -0700)]
more javadocs for onTrimMemory()
Change-Id: I52a99bc1b07732e474d1c632f3021c6c4db8c5ab
Deepanshu Gupta [Fri, 13 Sep 2013 21:55:06 +0000 (14:55 -0700)]
am
54d88f76: Fix ClassCastException when rendering ListView
* commit '
54d88f7678387a6eb871ec2dccd36af4ff35b1fe':
Fix ClassCastException when rendering ListView
Scott Main [Fri, 13 Sep 2013 19:59:59 +0000 (12:59 -0700)]
am
95e7df91: fix title for uses-sdk doc
* commit '
95e7df915fd3c173b4d8d71c1ac5cbeaa8c8e7ed':
fix title for uses-sdk doc
Scott Main [Fri, 13 Sep 2013 19:55:20 +0000 (12:55 -0700)]
fix title for uses-sdk doc
Change-Id: I544868d209f04cb46928861148e9320fc0118f56
Joe Malin [Thu, 12 Sep 2013 17:48:38 +0000 (10:48 -0700)]
am
6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
* commit '
6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
Android Training: Add Location Testing Lesson
Joe Malin [Thu, 12 Sep 2013 17:45:05 +0000 (17:45 +0000)]
Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs
Joe Malin [Sat, 27 Jul 2013 00:26:52 +0000 (17:26 -0700)]
Android Training: Add Location Testing Lesson
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
Dirk Dougherty [Thu, 12 Sep 2013 16:15:25 +0000 (09:15 -0700)]
am
89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
* commit '
89579294ce0fbe728738fa09fb45cc53fd79bfb5':
Pass whitelist of sample groups to doclava.
Dirk Dougherty [Thu, 12 Sep 2013 16:01:52 +0000 (16:01 +0000)]
Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs
Dirk Dougherty [Wed, 11 Sep 2013 18:53:35 +0000 (11:53 -0700)]
Pass whitelist of sample groups to doclava.
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
quddusc [Wed, 11 Sep 2013 17:09:45 +0000 (10:09 -0700)]
am
161e423e: Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
* commit '
161e423ead0e2272ebb0b73957abf0c916ad57ff':
docs: Fixed deprecated value. Bug:
10641906
Deepanshu Gupta [Tue, 10 Sep 2013 22:39:41 +0000 (15:39 -0700)]
Fix ClassCastException when rendering ListView
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
quddusc [Mon, 9 Sep 2013 20:22:55 +0000 (20:22 +0000)]
Merge "docs: Fixed deprecated value. Bug:
10641906" into jb-mr2-docs
Dirk Dougherty [Mon, 9 Sep 2013 17:42:47 +0000 (10:42 -0700)]
am
dd93ae32: Doc change: fix typo.
* commit '
dd93ae32a8d50147a95a270cc99f9474dbf9ee27':
Doc change: fix typo.
Dirk Dougherty [Mon, 9 Sep 2013 17:36:37 +0000 (10:36 -0700)]
Doc change: fix typo.
Change-Id: Idd14111f1b62430560a11c5803a864f2bad5eff0
quddusc [Fri, 6 Sep 2013 18:18:27 +0000 (11:18 -0700)]
docs: Fixed deprecated value.
Bug:
10641906
Change-Id: I1e89e031292fb225f67c7f8a06924f29a9e950b2
Wink Saville [Fri, 6 Sep 2013 16:12:50 +0000 (09:12 -0700)]
am
59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '
59a9884bf8280e2db9db7680370e98f40a065d56':
Do not change NetworkInfo.DetailedState.
Wink Saville [Fri, 6 Sep 2013 16:09:36 +0000 (16:09 +0000)]
Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
Wink Saville [Thu, 5 Sep 2013 19:02:25 +0000 (12:02 -0700)]
Do not change NetworkInfo.DetailedState.
I'd changed DetailedState to force ConnectivityService to treat
provisioning apn's specially. In particular so that they wouldn't
be identified they were fully connected until the provisioning
actually started. The problem is that DetailedState is a public enum
that has a CTS test and just changing the CTS to allow for the new
state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate.
Instead I've added a new mIsConnectedToProvisioningNetwork variable
and used the DetailedState.SUSPENDED as the intermediate state.
Bug:
10620248
Change-Id: Id4a842398cad67455541ce629959351c27d83639
Deepanshu Gupta [Thu, 5 Sep 2013 18:52:48 +0000 (11:52 -0700)]
am
3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
* commit '
3a762d8bfbe6b2d4066bc5cc90301063c19976c4':
Fix text rendering
Deepanshu Gupta [Thu, 5 Sep 2013 18:52:42 +0000 (11:52 -0700)]
am
68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
* commit '
68411471083abd7a7713483b5cd40f394387b7b3':
Fix layout rendering for RTL locales
Deepanshu Gupta [Thu, 5 Sep 2013 18:49:31 +0000 (18:49 +0000)]
Merge "Fix text rendering" into jb-mr2-dev
Deepanshu Gupta [Thu, 5 Sep 2013 18:48:55 +0000 (18:48 +0000)]
Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
Deepanshu Gupta [Fri, 12 Jul 2013 18:38:05 +0000 (11:38 -0700)]
Fix text rendering
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.
Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
Dirk Dougherty [Thu, 5 Sep 2013 05:23:48 +0000 (22:23 -0700)]
am
4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '
4ef51c3c4298cbd7980029b6b1cad2f6696f7bb5':
Add a few more samples to browser.
Dirk Dougherty [Thu, 5 Sep 2013 05:19:41 +0000 (05:19 +0000)]
Merge "Add a few more samples to browser." into jb-mr2-docs
Dirk Dougherty [Tue, 3 Sep 2013 22:32:24 +0000 (15:32 -0700)]
Add a few more samples to browser.
Change-Id: Iac7acc22a8dd71950b32e2c35c82f53abc34168a
Wink Saville [Thu, 5 Sep 2013 01:11:07 +0000 (18:11 -0700)]
am
ce1e3798: Add provisioning apn timeout.
* commit '
ce1e37981caec29df2671a6e2909f00da7f24a00':
Add provisioning apn timeout.
Scott Main [Wed, 4 Sep 2013 22:36:59 +0000 (15:36 -0700)]
am
002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs
* commit '
002057bf0452168fd88eb81c2d36f02cfb260769':
update dashboards for 9/13
Scott Main [Wed, 4 Sep 2013 22:35:04 +0000 (22:35 +0000)]
Merge "update dashboards for 9/13" into jb-mr2-docs
Scott Main [Wed, 4 Sep 2013 01:01:31 +0000 (18:01 -0700)]
update dashboards for 9/13
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
Deepanshu Gupta [Thu, 20 Jun 2013 00:29:12 +0000 (17:29 -0700)]
Fix layout rendering for RTL locales
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.
Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.
Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
Scott Main [Wed, 4 Sep 2013 16:18:23 +0000 (09:18 -0700)]
am
c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit '
c3adcf9dc745932bf3a059a7201644dd96b97750':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Scott Main [Wed, 4 Sep 2013 16:14:59 +0000 (16:14 +0000)]
Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
Scott Main [Wed, 4 Sep 2013 16:13:57 +0000 (09:13 -0700)]
am
605d56c0: Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
* commit '
605d56c0492536488c997c6ca0b85fd38fd4e19a':
clarify javadoc for constructors. bug:
10563421
Scott Main [Wed, 4 Sep 2013 16:10:58 +0000 (16:10 +0000)]
Merge "clarify javadoc for constructors. bug:
10563421" into jb-mr2-docs
Wink Saville [Tue, 3 Sep 2013 23:41:44 +0000 (16:41 -0700)]
Add provisioning apn timeout.
Bug:
10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
Dirk Dougherty [Tue, 3 Sep 2013 18:44:24 +0000 (11:44 -0700)]
am
5e52ee6e: Doc change: small refinement of brand usage guidelines.
* commit '
5e52ee6ecf08b299b433104798e736e2bc3904d5':
Doc change: small refinement of brand usage guidelines.
Dirk Dougherty [Tue, 3 Sep 2013 17:08:54 +0000 (10:08 -0700)]
Doc change: small refinement of brand usage guidelines.
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
Scott Main [Fri, 30 Aug 2013 20:56:05 +0000 (13:56 -0700)]
clarify javadoc for constructors.
bug:
10563421
Change-Id: Ifa898005a13f987e4de07d1a34cb3b289d533256
Ed Tam [Fri, 30 Aug 2013 21:04:45 +0000 (14:04 -0700)]
am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 20:50:35 +0000 (20:50 +0000)]
Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
quddusc [Thu, 29 Aug 2013 18:12:44 +0000 (11:12 -0700)]
am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
2ef3952d8e62b71baca176b3e17315a37facd34a':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
quddusc [Fri, 21 Jun 2013 23:49:46 +0000 (16:49 -0700)]
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
Wink Saville [Thu, 29 Aug 2013 17:22:55 +0000 (10:22 -0700)]
am
948282b0: Add support for handling mobile provisioning networks.
* commit '
948282b0e6cf5310f09db97a4ae939db7c1cef72':
Add support for handling mobile provisioning networks.
Wink Saville [Thu, 29 Aug 2013 15:55:16 +0000 (08:55 -0700)]
Add support for handling mobile provisioning networks.
When a sim is new or it has expired it needs to be provisioned
with the carrier. Basically provisioning is associating a sim with
a user account. When a sim isn't provisioned then operators will
restrict access to the network and only allow certain addresses
or services to be used.
This set of changes allows two types of provisioning networks to be
recognized. The first is a network that causes all DNS lookups to be
redirected to a different address than was intended. This is exemplified
by how T-Mobile works.
The second technique uses a special apn for provisioning. An example is
AT&T where lwaactivate is the provisioning apn and broadband is the
normal apn. We first try broadband and if we are unable to connect we
try lwaactivate. When we see the activate we identify it as special and
the ApnContext.isProvisioningApn will return true.
In the future our plan is to create a new network type that can be added
to the apn list, but for now it identified by name.
Here is a list of significant changes:
- CaptivePortalTracker now only test WiFi networks instead of all networks
- checkMobileProvisioning checks for provisioning networks and doesn't
try to ping.
- IConnectivityManager.aidl changes:
* getProvisioningOrActiveNetworkInfo was added to and used by Manage
mobile plan in WirelessSettings so even when there is no active
network it will still allow provisioning. Otherwise it would report
no internet connection.
* setSignInErrorNotificationVisible is used by both
CaptiviePortalTracker and checkMobileProvisioning so they use the
same code for the notifications.
* checkMobileProvisioning was simplified to have only a timeout as
returning the result is now harder as we abort simultaneous call
otherwise we'd could get into loops because we now check every time
we connect to mobile.
- Enhanced MDST to handle the provisioning network.
- Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new
state so we don't announce to the world we're connected.
- TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
is sent by the low level data connection code to notify Connectivity
Service that a provisioning apn has connected. This allows CS to
handle the connection differently than a normal connection.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Dirk Dougherty [Wed, 28 Aug 2013 18:42:05 +0000 (11:42 -0700)]
am
8236443b: Doc change: update spam policy image.
* commit '
8236443bdac2ba7c7630ddcc4ce9a18a03fe31a1':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 17:43:36 +0000 (10:43 -0700)]
Doc change: update spam policy image.
Change-Id: Ib19ea838f0f72725cedf2cea8aff505ccc477a45
Rika Brooks [Tue, 7 Aug 2012 21:51:19 +0000 (14:51 -0700)]
Telephony: SMS over IMS, DO NOT MERGE
Add RIL_REQUEST_IMS_REGISTRATION_STATE, RIL_REQUEST_IMS_SEND_SMS, and
RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED. Add FORMAT_UNKNOWN to
SmsConstants.
Bug:
9626411
Change-Id: I87ca9841b4ace931c55e2d379fe6d7589b2dc8a5
Scott Main [Mon, 26 Aug 2013 20:09:46 +0000 (13:09 -0700)]
am
d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs
* commit '
d608d5e3fa08cd9935f03144b192ea5934c715a8':
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
Scott Main [Mon, 26 Aug 2013 19:31:09 +0000 (12:31 -0700)]
add jb mr2 uses-feature items to reference page and fix a couple doc bugs
Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
Wink Saville [Mon, 26 Aug 2013 18:47:20 +0000 (11:47 -0700)]
am
dce52cdb: DO NOT MERGE: MDST is not ready until connected to DcTracker.
* commit '
dce52cdbf1eab8bd979bf4676973699c39f7b32e':
DO NOT MERGE: MDST is not ready until connected to DcTracker.
Wink Saville [Mon, 26 Aug 2013 18:40:36 +0000 (11:40 -0700)]
am
e63411f2: In isMobileOk don\'t execute finally if mobile data is not supported.
* commit '
e63411f28b81a0c9f7fee1d0b3a0765606c9a6f2':
In isMobileOk don't execute finally if mobile data is not supported.
Dirk Dougherty [Fri, 23 Aug 2013 22:45:53 +0000 (15:45 -0700)]
am
2c30fe8a: Doc change: fix typo in policy docs.
* commit '
2c30fe8aedc5af2845e97b9005d6dce570f9d8eb':
Doc change: fix typo in policy docs.
Dirk Dougherty [Fri, 23 Aug 2013 18:31:29 +0000 (11:31 -0700)]
Doc change: fix typo in policy docs.
Change-Id: Ic9df2511f50d9ead2dcbf4353f387e9106ce4222
Dirk Dougherty [Fri, 23 Aug 2013 17:15:42 +0000 (10:15 -0700)]
am
80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs
* commit '
80bd95bf86e43e5bbca6a08ede708524e5024a1c':
Doc change: update Google Play policies descriptions.
Dirk Dougherty [Fri, 23 Aug 2013 17:13:05 +0000 (17:13 +0000)]
Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs
Dirk Dougherty [Thu, 22 Aug 2013 19:46:10 +0000 (12:46 -0700)]
Doc change: update Google Play policies descriptions.
Change-Id: I4ebc985159db5f24632bac38cff63c7b663794b8
Scott Main [Fri, 23 Aug 2013 01:54:35 +0000 (18:54 -0700)]
am
f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting.
* commit '
f151391b72b5ab667ea0681de5bd2fbe0d94d8a9':
fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
Scott Main [Fri, 23 Aug 2013 01:11:01 +0000 (18:11 -0700)]
fix markup errors in action bar styling,
add more information about using drawables,
move 'managing the activity lifecycle' down a notch, because it's less interesting.
Change-Id: I75012207bfaa499ca881ec5cc3a94e8d66addbad
Scott Main [Fri, 23 Aug 2013 00:19:17 +0000 (17:19 -0700)]
replace instances of Wi-Fi Direct with Wi-Fi P2P
Change-Id: I21cb06e27e98c428b4f3f4ac72e759f61607e468
Dirk Dougherty [Thu, 22 Aug 2013 17:08:08 +0000 (10:08 -0700)]
am
2a4f71df: Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs
* commit '
2a4f71df86e42f14705df452b74358e0b7970815':
Temporarily disable sample code html generation in docs builds.
Dirk Dougherty [Thu, 22 Aug 2013 17:03:35 +0000 (17:03 +0000)]
Merge "Temporarily disable sample code html generation in docs builds." into jb-mr2-docs
Dirk Dougherty [Wed, 21 Aug 2013 21:47:12 +0000 (14:47 -0700)]
Temporarily disable sample code html generation in docs builds.
Change-Id: Ibcf0e4d5ab63968211528f528cc5bee914d7a556
Scott Main [Wed, 21 Aug 2013 00:17:34 +0000 (17:17 -0700)]
am
414905b7: update samples nav for new script
* commit '
414905b7044b10b7231f13584bf26e7c8c3e1e12':
update samples nav for new script
Scott Main [Wed, 21 Aug 2013 00:07:05 +0000 (17:07 -0700)]
update samples nav for new script
Change-Id: I4b357f1edf2d8e3eb7b3810103c60d3fd470e113
Joe Fernandez [Mon, 19 Aug 2013 23:49:44 +0000 (16:49 -0700)]
am
9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
* commit '
9d237204da9b000c5debfa1f5650d13a545bb7c8':
Android 4.3 Platform Google APIs r2 system image Release Notes
Joe Fernandez [Mon, 19 Aug 2013 23:47:24 +0000 (23:47 +0000)]
Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs
Joe Fernandez [Thu, 15 Aug 2013 21:06:19 +0000 (14:06 -0700)]
Android 4.3 Platform Google APIs r2 system image Release Notes
Google APIs System image update with Google Play Services 3.2.25
Change-Id: Iac6987a9dcb55bd971da9ca57c5a5dae0c357be5
Dirk Dougherty [Mon, 19 Aug 2013 19:09:45 +0000 (12:09 -0700)]
am
b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters.
* commit '
b6bc020d728960dc876a510c9e40cc441a9a9b6b':
doc change: Samples browsing first changes: Samples dir and file starters.
Dirk Dougherty [Tue, 9 Jul 2013 20:18:15 +0000 (13:18 -0700)]
doc change: Samples browsing first changes: Samples dir and file starters.
Change-Id: I6cc8c03bf4c2bcc771d4531619db5b3acd62601f
Wink Saville [Sat, 17 Aug 2013 00:17:28 +0000 (17:17 -0700)]
DO NOT MERGE: MDST is not ready until connected to DcTracker.
When the system becomes loaded the PhoneApp can be delayed
significantly and a call to setEnableFailFastMobileData may not
occur because the channel between the MobileDataStateTracker (MDST)
and DcTracker (DCT) is not connected.
Solution: Add a isReady to MDST and isMobileDataStateTrackerReady to
ConnectivityService and call it from isMobileOk.
Bug:
10351868
Change-Id: I92f9d58121b88186b636cd71c2fd2ef9a28f7cf6
Scott Main [Fri, 16 Aug 2013 17:55:07 +0000 (10:55 -0700)]
am
b4f96287: add latest Roboto fonts to DAC and update download links
* commit '
b4f96287285cd0886954d1576157b7a38995af88':
add latest Roboto fonts to DAC and update download links
Scott Main [Fri, 16 Aug 2013 17:41:31 +0000 (10:41 -0700)]
add latest Roboto fonts to DAC and update download links
Change-Id: I6232cf02486d5b82d503ebe8c6035a7da2a1093d
Wink Saville [Tue, 13 Aug 2013 19:41:06 +0000 (12:41 -0700)]
In isMobileOk don't execute finally if mobile data is not supported.
Move the early return outside the try {} finally so we don't call
setEnableFailFastMobileData(DctContants.DISABLED). Otherwise
referencing counting is wrong and an exception is thrown in DcTrackerBase.
Bug:
10304904
Change-Id: I5ba5121e473bada9f3daa8d6f3d3577cec8212fc
Roman Nurik [Wed, 14 Aug 2013 18:21:45 +0000 (11:21 -0700)]
am
1a5bb9d5: Update Typography design guide Bug:
6947941
* commit '
1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
Update Typography design guide Bug:
6947941
Roman Nurik [Wed, 14 Aug 2013 16:52:41 +0000 (09:52 -0700)]
Update Typography design guide
Bug:
6947941
Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
Kenny Root [Wed, 14 Aug 2013 00:57:10 +0000 (17:57 -0700)]
am
1c2cb653: am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
1c2cb6533bfebf8b930850215e24327420e34a4b':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:54:18 +0000 (17:54 -0700)]
am
999ddae7: am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
999ddae70360fc99e804d0b176af487582cd37c8':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:51:15 +0000 (17:51 -0700)]
am
ae24c0d5: am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
ae24c0d539414805a6c979f9318d0765506221ae':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:48:20 +0000 (17:48 -0700)]
am
bf15c7ce: am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
bf15c7cecefba8fdb3070c389a4966f11a8d8656':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:44:27 +0000 (17:44 -0700)]
am
dceda36b: am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:42:45 +0000 (17:42 -0700)]
am
1c5e33d3: am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
1c5e33d37dd4f8c68ccc16758e21572f193a8eb2':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:36:42 +0000 (17:36 -0700)]
am
3bc3240f: am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
3bc3240ffb51358fa706099cfc5e120cf0f1b60d':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:31:32 +0000 (17:31 -0700)]
am
a6226a2d: am
32c99004: Use hostname verifier directly instead of instance
* commit '
a6226a2d202619ddb7e3e9765a3dc9f20241f853':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 14 Aug 2013 00:27:49 +0000 (17:27 -0700)]
am
32c99004: Use hostname verifier directly instead of instance
* commit '
32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
Kenny Root [Tue, 13 Aug 2013 18:41:11 +0000 (11:41 -0700)]
am
3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '
3870c570bbd438cefd09a061b9481314a15dd659':
Use hostname verifier directly instead of instance DO NOT MERGE
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
Scott Main [Tue, 13 Aug 2013 17:57:31 +0000 (10:57 -0700)]
am
b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '
b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
Katie McCormick [Mon, 12 Aug 2013 19:18:45 +0000 (12:18 -0700)]
am
e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '
e78b4f53392d25eda4a121670aca518df9615f71':
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Katie McCormick [Wed, 24 Jul 2013 01:12:38 +0000 (18:12 -0700)]
Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Scott Main [Mon, 12 Aug 2013 17:38:03 +0000 (17:38 +0000)]
Revert "Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
Submitted the original revert too soon.
This reverts commit
ebcee19783c4fe5ba776353e95974383850a4685.
Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
Scott Main [Mon, 12 Aug 2013 17:08:28 +0000 (17:08 +0000)]
Revert "resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev"
revert to fix conflicts, i'll fix it all later.
This reverts commit
385bb2eb5184686c2d953fe4757522e61acb3392.
Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
Scott Main [Mon, 12 Aug 2013 16:57:24 +0000 (09:57 -0700)]
Revert "Doc change: collapse key fix."
To resolve conflict. I'll fix it all later.
This reverts commit
53d9628d080aa7339b724a994607022c5386a566.
Katie McCormick [Sat, 10 Aug 2013 00:55:05 +0000 (17:55 -0700)]
resolved conflicts for merge of
45178b13 to jb-mr2-ub-dev
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
Katie McCormick [Fri, 9 Aug 2013 22:41:34 +0000 (22:41 +0000)]
Merge "Doc change: collapse key fix." into jb-mr2-dev
Katie McCormick [Wed, 24 Jul 2013 01:12:38 +0000 (18:12 -0700)]
Doc change: collapse key fix.
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Wink Saville [Thu, 8 Aug 2013 22:43:24 +0000 (15:43 -0700)]
am
4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '
4d87d91dfe886713df96abd3c0d1c9e20cf385e5':
If in a mobile captive portal is detected enable fail fast.