11139 Commits

Author SHA1 Message Date
Vinit Deshapnde
892b52f151 am 9f250e28: am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev
* commit '9f250e28c39abfb14a80c1997a1915b97940e070':
  Temporarily disable 'Scan Always' mode
2013-07-01 17:58:40 -07:00
Vinit Deshapnde
93647e2f8f Merge "Temporarily disable 'Scan Always' mode" into jb-mr2-dev 2013-07-02 00:54:19 +00:00
Vinit Deshapnde
c16b0d0061 Temporarily disable 'Scan Always' mode
This change disables 'Scan Always' by ignoring the setting; and
hard coding value to 'false'. The UI will change based on whatever
is in settings; but underneath we won't enable scans when WiFi is
off.

Change-Id: Ibb1401207b6675e609e979ea23b63177814f762c
2013-07-01 17:10:28 -07:00
Wink Saville
3b5d686e68 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
2013-07-01 15:41:31 -07:00
Wink Saville
59046f40ba Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 2013-07-01 22:36:48 +00:00
Wink Saville
ab9321d13d Add checkMobileProvisioning to ConnectivityService.
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-06-29 21:10:57 -07:00
Elliott Hughes
b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp
Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6
2013-06-28 16:50:13 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
2013-06-28 16:41:19 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
2013-06-28 16:24:48 -07:00
Robert Greenwalt
c869696ef3 am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
* commit '65f7a95fc4c06127e7372bcb0d14e561cc23dd80':
  Fix power issues around wifi scans.
2013-06-26 10:55:00 -07:00
Robert Greenwalt
2f50097a5d Merge "Fix power issues around wifi scans." into jb-mr2-dev 2013-06-26 17:43:39 +00:00
Robert Greenwalt
8971084258 Fix power issues around wifi scans.
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
2013-06-26 10:00:16 -07:00
Svetoslav
0cb0a37f1c am a0b9e1ee: am 99e4a0f5: Merge "Improper initialization of the accessibility manager service." into jb-mr2-dev
* commit 'a0b9e1eead9cbde980ca5ee8406100d9f3bb8d4d':
  Improper initialization of the accessibility manager service.
2013-06-25 15:01:16 -07:00
Christopher Tate
3c0cd0b540 am 34718238: am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
* commit '347182386c54fd4aa4478f35b712c230eb290468':
  Avoid adding FORWARD_LOCK flag to an updated system app
2013-06-24 16:08:15 -07:00
Christopher Tate
347182386c am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
* commit '3e7d0344399ac2f607fddde32c1a5e54228a38f9':
  Avoid adding FORWARD_LOCK flag to an updated system app
2013-06-24 16:05:49 -07:00
Christopher Tate
3e7d034439 Merge "Avoid adding FORWARD_LOCK flag to an updated system app" 2013-06-24 23:02:00 +00:00
Svetoslav
3b817aed7d Improper initialization of the accessibility manager service.
Initially the current user in the accessibility manager service is the
owner. This is correct since the system should be able to respond to
queries immediately and their result depends on the current user. However,
the system is calling the user switch callback with the current user
which is the same as the one we initialized with. Switching the user
causes clearing state for the old user winch is in case the current
one. Hence, we are losing state for the current user. This behavior was
masked from the fact that accidentally no events in the system were
fired before the first use user switch call.

repo Losing current user state puts the manager service in an inconsistent
state and it binds to accessibility services more than once. As a result
the accessibility layer starts to misbehave rendering the device useless
to a blind user.

Now we are ignoring user switch callbacks if the new user is the same
as the current one. Since we can no longer initialize at the first user
switch, this change adds explicit system ready method called from
the system server at the right moment.

bug:9496697

Change-Id: Icb39e929ea44e6c0360aba7ddc12f941ca2c9f98
2013-06-21 18:38:20 -07:00
Daniel Sandler
5be52fb5ae am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev
* commit 'a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be':
  Temporarily restore some support for icon==0 notifications.
2013-06-14 13:34:55 -07:00
Daniel Sandler
a0c9b9d2a7 Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 2013-06-14 20:29:24 +00:00
Ashish Sharma
c8aa0b49a6 am 58100fb8: Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev
* commit '58100fb813f4a68386757fc80244dbb756ea35d5':
  Do not allow 0 or smaller periodicity for syncs. b/9295383
2013-06-11 14:09:56 -07:00
Daniel Sandler
0a2ff8db43 am 4e5694aa: Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev
* commit '4e5694aaa7e03723e248c0d1e47e5a322c403a90':
  Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
2013-06-11 14:09:38 -07:00
Ashish Sharma
59dc7a8e75 Do not allow 0 or smaller periodicity for syncs.
b/9295383

Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
(cherry picked from commit 4970974d74a2986a333e645a5c141ef5f9a753cc)
2013-06-10 19:14:52 +00:00
Daniel Sandler
4e5694aaa7 Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev 2013-06-10 18:31:51 +00:00
Daniel Sandler
7c011302b6 Do not block notifications or toasts for SYSTEM_UID or PHONE_UID.
The specific bug is this: SIM PIN unlock attempt toasts are
sent from com.android.settings/.IccLockSettings which runs
as the phone process; NoMan wasn't having any of that and
was blocking the toasts.

With this change we treat SYSTEM_UID and PHONE_UID the same
for all security checks, and furthermore we guarantee that
all notifications and toasts from those UIDs will be
permitted.

Bug: 9098802
Change-Id: Idc788527aa2cb38e015fe92773766a514167999e
2013-06-10 12:19:16 -04:00
Jeff Sharkey
e96a820771 am 56cd646a: Avoid logging sensitive data.
* commit '56cd646abeae51e806791f82ab0995fe047b1fe4':
  Avoid logging sensitive data.
2013-06-09 19:07:48 -07:00
Jeff Sharkey
56cd646abe Avoid logging sensitive data.
When building commands to send across NativeDaemonConnector, scrub
sensitive arguments to prevent them from being logged.

Bug: 8609800
Change-Id: I84b16791749264a010f7e59f9918f68d71bac6b9
2013-06-07 15:09:32 -07:00
Dianne Hackborn
a79aaeae55 am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev
* commit '8c1d1b3edff299ca6ef5739e044343b7f2c57f73':
  Maybe fix issue #9296868: Crash in system process
2013-06-05 15:17:26 -07:00
Dianne Hackborn
f5fdca9dc1 Maybe fix issue #9296868: Crash in system process
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
2013-06-05 14:53:33 -07:00
Robert Greenwalt
530098327c am 05caa2a3: Apply scan-always setting to initial wifi state.
* commit '05caa2a3de32e54562d1ec3031f73ef5392cfb40':
  Apply scan-always setting to initial wifi state.
2013-06-03 08:41:48 -07:00
Robert Greenwalt
05caa2a3de Apply scan-always setting to initial wifi state.
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.

bug:9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
2013-06-01 10:59:29 -07:00
Robert Greenwalt
66c7bd5404 am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev
* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
  Remember wifi country that's set before boot
2013-06-01 08:58:16 -07:00
Robert Greenwalt
304aad49cd Remember wifi country that's set before boot
Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time.  Remember
and write it on BOOT_COMPLETED

Also, there are permission issues around writing the setting.

bug:9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
2013-05-31 21:10:15 -07:00
Victoria Lease
51ff6f953c am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev
* commit 'd9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
  break up LocationManagerService's WakeLock
2013-05-29 17:20:01 -07:00
Victoria Lease
a9770e4f06 break up LocationManagerService's WakeLock
This commit splits LocationManagerService's monolithic WakeLock into
per-LocationManagerService.Receiver WakeLocks, for better WorkSource
accounting. This should make it easier to debug location-related
power issues.

Change-Id: I0d2897c305a38099f9663dc1bc9354ce4bbe1077
(cherry picked from commit 0aa28602d51bf41e46d18ffefe724ebc3ff7a704)
2013-05-29 17:11:25 -07:00
Amith Yamasani
3ec14d9cf1 am 9b76b2d2: Merge "framework:base: iterator error in singletone provider"
* commit '9b76b2d29fa338a128f699a1f40f7f5916a512af':
  framework:base: iterator error in singletone provider
2013-05-29 15:18:50 -07:00
Amith Yamasani
9b76b2d29f Merge "framework:base: iterator error in singletone provider" 2013-05-29 22:04:01 +00:00
Jun Su
cca0965a1b framework:base: iterator error in singletone provider
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.

Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
2013-05-29 14:33:59 +08:00
Jeff Sharkey
ab4a054199 am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit 'e4c29de9c69d332d65d2eb490961faffab4467fd':
  Add missing ACTION_MEDIA_UNMOUNTED intent
2013-05-28 15:46:08 -07:00
Maunik Shah
46c94b6626 DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.

Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
2013-05-28 13:46:24 -07:00
Jeff Sharkey
e4c29de9c6 Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 2013-05-28 20:44:47 +00:00
Dianne Hackborn
840f114395 am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
  Fix wrong log information in DevicePolicyManagerService
2013-05-26 00:23:28 -07:00
Dianne Hackborn
7f3ff133c1 Merge "Fix wrong log information in DevicePolicyManagerService" 2013-05-26 07:22:21 +00:00
Dianne Hackborn
087384b0af am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition
2013-05-26 00:02:24 -07:00
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
Robert Greenwalt
f2eb6fbc0a am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections
2013-05-24 09:24:32 -07:00
Robert Greenwalt
36a151abcd Merge "Use the old interface when resetting connections" into jb-mr2-dev 2013-05-24 16:21:35 +00:00
Robert Greenwalt
80eb63b58b Use the old interface when resetting connections
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
2013-05-23 18:33:06 -07:00
Andrew Wilson
f25b876c8d am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
* commit '55bf965e89df5986a7a988c2b1ec2cd9f01edb56':
  Compare binder instances when checking if listeners match.
2013-05-23 13:08:04 -07:00
Andrew Wilson
55bf965e89 Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev 2013-05-23 18:47:48 +00:00
Amith Yamasani
77049e1303 am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
* commit '60b4afedbeea11983b748d0d8ea9032d177dd6e7':
  Fix account filtering for specific package name
2013-05-23 07:41:09 -07:00