OSDN Git Service
Craig Mautner [Tue, 25 Mar 2014 17:29:48 +0000 (10:29 -0700)]
am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
02c7ba73e8733def289535b6d13dc6a504a0443f':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)]
am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
41bb0637ca430808ab40a0300467ea58ae0a05c3':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:04:07 +0000 (10:04 -0700)]
am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
76e85eec845ff3688e6fd5b7bafbb5934530df4b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:58:17 +0000 (09:58 -0700)]
am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
3bc9971d707839f2d26e601082d654242295002d':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
95d6e32bc3c5382740a6bb418f77cf7147d833f7':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
86f9a93e20bf33b9f5152592f4781bd253be8643':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.
Fixes bug
13225149.
Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
Marco Nelissen [Thu, 20 Mar 2014 19:51:55 +0000 (12:51 -0700)]
resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Victoria Lease [Wed, 19 Mar 2014 22:08:32 +0000 (15:08 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:03:28 +0000 (15:03 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:57:36 +0000 (14:57 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:51:58 +0000 (14:51 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:47:23 +0000 (14:47 -0700)]
am
31912122: am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
3191212259b1629cf8174416adf01522b88501ad':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:40:17 +0000 (14:40 -0700)]
am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
6eb2810318262ff36014c52384ed3cdea19bd34e':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)]
am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:27:19 +0000 (14:27 -0700)]
am
1c12f9e7: malloc some advances
* commit '
1c12f9e76298c757423155ad812890d27effafe8':
malloc some advances
Adrian Roos [Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)]
am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:41:20 +0000 (13:41 -0700)]
am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
500ec9ce4b7856eca480c4c7dca8df1211614102':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:34:05 +0000 (13:34 -0700)]
am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
25fb7133901f6a538d5d365f3c0c1c936e76679d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
d3da8f711ec642322e497a493985bed5c43f597b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ecba937b005b07d72eadfaf93a200e0b14af2980':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 17:33:14 +0000 (18:33 +0100)]
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit
91c9561cbe665f91e1665f30362c409ae180b127)
Bug:
13302967
Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
Victoria Lease [Mon, 17 Mar 2014 23:03:28 +0000 (16:03 -0700)]
malloc some advances
Bug:
13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit
3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
Marco Nelissen [Thu, 13 Mar 2014 21:18:59 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Cherrypicked from
7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
https://googleplex-android-review.git.corp.google.com/#/c/433316/
Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
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