OSDN Git Service
Craig Mautner [Thu, 13 Mar 2014 19:35:23 +0000 (12:35 -0700)]
Resolved conflicts for merge of
ad63d914 to jb-mr2-dev
Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
Craig Mautner [Thu, 13 Mar 2014 18:01:13 +0000 (11:01 -0700)]
am
20a4f490: am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
20a4f490957407b9534fc453833de2fe2f276426':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:58:11 +0000 (10:58 -0700)]
am
817f5586: am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
817f5586053ae135a59cd0768980ca741e9215b0':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:55:31 +0000 (10:55 -0700)]
am
3d958f81: am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
3d958f81c54252b452631ea1bb6e7954fc7066c8':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:51:39 +0000 (10:51 -0700)]
am
468e8e98: am
1f52437d: Show the keyguard if unsecure window on top
* commit '
468e8e9873d764c090576d70aebf658e3e89bbfe':
Show the keyguard if unsecure window on top
Craig Mautner [Thu, 13 Mar 2014 17:47:49 +0000 (10:47 -0700)]
am
1f52437d: Show the keyguard if unsecure window on top
* commit '
1f52437de9aa6089a72c7c992f9e7291a6a96115':
Show the keyguard if unsecure window on top
Craig Mautner [Mon, 3 Mar 2014 21:26:03 +0000 (13:26 -0800)]
Show the keyguard if unsecure window on top
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.
(cherry picked from commit
ab55e524b89c13082193940a5bf8480a2c2522d9)
Fixes bug
13225149.
Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
Paul Lawrence [Thu, 27 Feb 2014 19:55:10 +0000 (11:55 -0800)]
am
2e582d13: am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
2e582d1379fa78e2693269d76d2bcd763bfbfba1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:44:37 +0000 (11:44 -0800)]
am
9bce4032: am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:40:21 +0000 (11:40 -0800)]
am
08ee74b1: am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
08ee74b1f1c4df28faa4168114853836cc471095':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:38:01 +0000 (11:38 -0800)]
am
ea5586ef: am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
ea5586ef7fc29463f8144931c2c43261d15043b1':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:28:43 +0000 (11:28 -0800)]
am
4be7c61a: am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
4be7c61a339f8200527f6df5a7b2215c96f81b4b':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:24:05 +0000 (11:24 -0800)]
am
5677513b: am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
5677513b7c46ca08a7fa34b9d227d7a448db6757':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:20:24 +0000 (11:20 -0800)]
am
da37ed8b: am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Thu, 27 Feb 2014 19:16:49 +0000 (11:16 -0800)]
am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Wed, 26 Feb 2014 23:42:34 +0000 (15:42 -0800)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
This is a backport of
5bab9daf3cf66f4de19f8757e386030e8bef23ce
Bug:
7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
Carlos Valdivia [Sun, 29 Sep 2013 12:11:56 +0000 (05:11 -0700)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
Bug:
7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit
5bab9daf3cf66f4de19f8757e386030e8bef23ce)
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2
Conflicts:
core/java/android/net/LinkProperties.java
services/java/com/android/server/WifiService.java
wifi/java/android/net/wifi/WifiStateMachine.java
David Christie [Mon, 13 Jan 2014 20:46:35 +0000 (12:46 -0800)]
am
4013c4b1: am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
4013c4b18ccc66b510f4cdb222d4c04597975843':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:43:47 +0000 (12:43 -0800)]
am
42d7a0bf: am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:41:48 +0000 (12:41 -0800)]
am
a7d13fab: am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a7d13fabd6184e411215e9a841cf16097f1a5127':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:40:04 +0000 (12:40 -0800)]
am
45aaa377: am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
45aaa377c5d090003c6cf5fb54fff856a0807c4f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:36:49 +0000 (12:36 -0800)]
am
a1b89310: am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a1b89310d58df14570f7f6f5abb677c976c63a7a':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Mon, 13 Jan 2014 20:33:39 +0000 (12:33 -0800)]
am
a87bdc1f: Merge commit \'
bc39746e\' into manualmerge
* commit '
a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
Daniel Cashman [Mon, 13 Jan 2014 18:44:45 +0000 (18:44 +0000)]
Merge "Clear cached locations when location providers disabled Bug:
12118307" into jb-mr2-dev
David Christie [Fri, 10 Jan 2014 21:17:01 +0000 (13:17 -0800)]
Merge commit '
bc39746e' into manualmerge
David Christie [Fri, 10 Jan 2014 21:14:04 +0000 (13:14 -0800)]
am
ea47cb67: (-s ours) am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:10:12 +0000 (13:10 -0800)]
am
bf6cecc2: am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:05:35 +0000 (13:05 -0800)]
am
5716e4bf: am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
5716e4bfb980c8bab01b51944c1e715d76d59b1d':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:02:48 +0000 (13:02 -0800)]
am
776b3956: am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
776b3956a9742b868b037dffd2b24c17b2dfa0e6':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 21:00:09 +0000 (13:00 -0800)]
am
7f4d8293: am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
7f4d82932c812fbac1d99ceaf9462b7a763f5231':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 20:55:24 +0000 (12:55 -0800)]
am
6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
6826387e50f9f272d53ca1f725f573bbddcdf5c1':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Fri, 10 Jan 2014 20:53:41 +0000 (12:53 -0800)]
am
8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
8e0c7768c87014fef277df84c737dd6c37fb8866':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Tue, 7 Jan 2014 02:15:05 +0000 (18:15 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug:
12118307
Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa
David Christie [Tue, 7 Jan 2014 01:57:30 +0000 (17:57 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug:
12118307
Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
David Christie [Wed, 18 Dec 2013 22:33:57 +0000 (14:33 -0800)]
Clear cached locations when location providers disabled
Bug:
12118307
(cherry picked from commit
b084fef18ee1b5d24d15cff37dc3a053933d361e)
Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c
Christopher Tate [Fri, 8 Nov 2013 20:47:43 +0000 (12:47 -0800)]
am
05e3f55f: am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
05e3f55f17e36b415a23095dbeaa1d04716aed5a':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:45:38 +0000 (12:45 -0800)]
am
1d8f592a: am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
1d8f592a752c30534a6e03889f1ba42b232770ef':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:41:57 +0000 (12:41 -0800)]
am
ef12b1d4: am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ef12b1d4a9ba6a91b61647feadaf2c4cdf34c356':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:37:43 +0000 (12:37 -0800)]
am
ea198841: am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ea198841a9e64d72de49811e0e2c555eb2c40b9b':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:36:05 +0000 (12:36 -0800)]
am
ef4694cb: am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ef4694cbdd2e374e063d5d89bcb7c4b041c20a30':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:34:13 +0000 (12:34 -0800)]
am
ae229d99: am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
ae229d991711745bdf8da2e716c31efde534e6da':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:31:09 +0000 (12:31 -0800)]
am
43253333: am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
43253333d24e856a7ffef818fdfaedf3fd60d3b6':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Fri, 8 Nov 2013 20:27:10 +0000 (12:27 -0800)]
am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Tue, 5 Nov 2013 20:28:10 +0000 (12:28 -0800)]
System package permission decls take precedence over 3rd party apps'
In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.
Bug
11242510
(Cherry-pick backport to JB)
Change-Id: Iabf7b6280e6c6674a51af5624142bd19ea0750ed
Selim Gurun [Thu, 7 Nov 2013 19:40:02 +0000 (11:40 -0800)]
DO NOT MERGE Add a delimiter between scheme and host
Bug:
6923539
Change-Id: Ia78e185f00184c53babe00df3c852114ffd721f0
Deepanshu Gupta [Thu, 17 Oct 2013 16:01:07 +0000 (16:01 +0000)]
Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev
Deepanshu Gupta [Thu, 17 Oct 2013 16:00:57 +0000 (16:00 +0000)]
Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev
Deepanshu Gupta [Tue, 15 Oct 2013 01:14:58 +0000 (18:14 -0700)]
Fix CalendarView to show the right month and year label.
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
Deepanshu Gupta [Sun, 13 Oct 2013 01:37:19 +0000 (18:37 -0700)]
Fix DatePicker and Calendar widget in layoutlib.
Issue: https://code.google.com/p/android/issues/detail?id=59732
Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
Deepanshu Gupta [Tue, 10 Sep 2013 22:41:21 +0000 (15:41 -0700)]
Layoutlib Create: Remove references to non-std Java classes.
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.
Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
Deepanshu Gupta [Sun, 13 Oct 2013 04:28:50 +0000 (21:28 -0700)]
Layoutlib: Update the wifi icon in the status bar.
Issue: https://code.google.com/p/android/issues/detail?id=60993
Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
Robert Greenwalt [Thu, 3 Oct 2013 23:59:05 +0000 (16:59 -0700)]
DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.
bug:
10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
Amith Yamasani [Fri, 27 Sep 2013 18:46:29 +0000 (11:46 -0700)]
am
d084cc44: am
4f59a921: am
12fd0f16: am
f6a0c116: am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
d084cc44eb59407c851399d548256c145eb45342':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:31:18 +0000 (11:31 -0700)]
am
4f59a921: am
12fd0f16: am
f6a0c116: am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
4f59a9216e76207a7003bfe010076aa78eee629a':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:25:20 +0000 (11:25 -0700)]
am
12fd0f16: am
f6a0c116: am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
12fd0f1644b28b6938a504492397e8ca8d38a1c5':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:23:08 +0000 (11:23 -0700)]
am
f6a0c116: am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
f6a0c11615bd5c2c934527a0b20ba13f958913c4':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:20:20 +0000 (11:20 -0700)]
am
9bf1a139: am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
9bf1a1394852ad773d590d1cc60c5e50be8cb1b9':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:17:57 +0000 (11:17 -0700)]
am
72c5e376: am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
72c5e376879fb72548ef2a1c8d5b063853d174ee':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:14:23 +0000 (11:14 -0700)]
am
ba1ae3af: am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
ba1ae3af76466b94efedf06c4efac365fd7b9300':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:10:36 +0000 (11:10 -0700)]
am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
427864188dfc5dd803b15797379b9dc6673abd16':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Thu, 26 Sep 2013 23:14:36 +0000 (16:14 -0700)]
Don't instantiate non-Fragments in Fragment.instantiate
Backport...
Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug:
9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d
Wink Saville [Sat, 21 Sep 2013 16:01:19 +0000 (09:01 -0700)]
Do not always call setIsConnectedToProvisioningNetwork(false)
Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.
If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.
Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.
Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.
Bug:
10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
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
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: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
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
Wink Saville [Tue, 3 Sep 2013 23:41:44 +0000 (16:41 -0700)]
Add provisioning apn timeout.
Bug:
10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
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
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
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
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
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
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 [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 [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 [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:07:27 +0000 (22:07 +0000)]
Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
Wink Saville [Thu, 8 Aug 2013 22:06:21 +0000 (22:06 +0000)]
Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
Wink Saville [Thu, 8 Aug 2013 22:05:20 +0000 (22:05 +0000)]
Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
Wink Saville [Thu, 8 Aug 2013 22:03:44 +0000 (22:03 +0000)]
Merge "Check that hipri has started." into jb-mr2-dev
Wink Saville [Wed, 7 Aug 2013 23:22:47 +0000 (16:22 -0700)]
If in a mobile captive portal is detected enable fail fast.
When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.
Bug:
9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
Dianne Hackborn [Wed, 7 Aug 2013 22:36:08 +0000 (15:36 -0700)]
Fix issue #
10226007: Reset apps restores most of the changed settings...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
Wink Saville [Wed, 7 Aug 2013 18:02:57 +0000 (11:02 -0700)]
Check that hipri has started.
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.
Bug:
9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
Xia Wang [Mon, 5 Aug 2013 22:51:03 +0000 (22:51 +0000)]
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
Wink Saville [Fri, 2 Aug 2013 18:25:23 +0000 (11:25 -0700)]
In CaptiviePortalTracker a socket timeout is probably a captive portal.
On a AT&T warm SIM a socket is not possible so a timeout occurs.
In CheckMp a timing out on a socket is declared as a "warm" sim,
make CaptivePortalTracker the same.
Bug:
10038362
Change-Id: Icb9fb0a1b67704dc9adf6a6348a3781fb9582a89
Wink Saville [Sun, 21 Jul 2013 03:31:59 +0000 (20:31 -0700)]
Have CaptivePortalTracker use gservices updateable provisioning urls.
After detecting there is a captive portal the url used in the
notification for mobile networks should be updateable via gservices.
These urls will be the same as used by CheckMp and is needed for
carriers that have specific provisioning urls such as AT&T and Verizon.
Bug:
9622647
Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0