20241 Commits

Author SHA1 Message Date
John Spurlock
cbb732a8c4 am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
* commit '39838b98f1fef11ff29bf682029331849a39a633':
  Zen: Fix downtime calculation for Sunday mornings.
2014-09-29 20:49:29 +00:00
Christoph Studer
0bb9d83275 am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev
* commit 'f7c4509ffbbe6b1849c3ea61edac8d1d23906eaa':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
2014-09-29 20:48:08 +00:00
Paul Jensen
a621a97f4a am 89e0f093: Move mobile provisioning APN support into telephony.
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
  Move mobile provisioning APN support into telephony.
2014-09-29 20:47:32 +00:00
John Spurlock
39838b98f1 Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev 2014-09-29 20:04:47 +00:00
John Spurlock
d8826bcb2b Zen: Fix downtime calculation for Sunday mornings.
Previous calculation would always exit downtime on Sunday mornings,
due to the target day ending up at zero (an invalid day).

Bug:17682999
Change-Id: Icc5f01a42c3c644170eea9e60442cf77ce15a06c
2014-09-29 15:39:04 -04:00
Christoph Studer
f7c4509ffb Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 2014-09-29 16:13:29 +00:00
Christoph Studer
9ffa50096f NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
Bug: 17660485
Change-Id: I8684067538fcd2d43a9f95c6aa707b275b13ee40
2014-09-29 18:08:26 +02:00
Paul Jensen
89e0f0937a Move mobile provisioning APN support into telephony.
Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.

bug:17324098

Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
2014-09-29 11:37:43 +00:00
jgu21
df44f76444 am 20867871: Frameworks/base: Early init native bridge
* commit '208678718f9f8db3bc279c7d5bd1445af2831ae3':
  Frameworks/base: Early init native bridge
2014-09-29 03:37:34 +00:00
jgu21
208678718f Frameworks/base: Early init native bridge
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

(cherry picked from commit 2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5)

Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
2014-09-28 15:35:59 -07:00
New Author Steven Liu
36e7229835 am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app
* commit '0f84094579696739facbd75a56a4e7b98a6a5edc':
  redirect RIL_UNSOL_OEM_HOOK_RAW to system app
2014-09-27 07:22:10 +00:00
New Author Steven Liu
485f2095f8 redirect RIL_UNSOL_OEM_HOOK_RAW to system app
Add LISTEN_OEM_HOOK_RAW_EVENT and onOemHookRawEvent to PhoneStateListener.

Bug: 17298769
Change-Id: Iaea054d3cc2925eea1e11f8871faabc7bc9dfb2d
2014-09-27 07:16:38 +00:00
RoboErik
507cee74c0 am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev
* commit '55ecb483ba3afdc46eb4bec5daea4e56a195df22':
  Don't forward media keys to the app if the phone session is active
2014-09-26 22:58:32 +00:00
Elliott Hughes
2d895e5b21 am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev
* commit '70c1f083332729a586d670af7565732a2eb06ab4':
  Set the system locale correctly even on an encrypted device.
2014-09-26 22:58:28 +00:00
RoboErik
e3c3de677c Merge "Don't forward media keys to the app if the phone session is active" into lmp-dev 2014-09-26 22:52:40 +00:00
Elliott Hughes
f839b4fcb6 Set the system locale correctly even on an encrypted device.
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
2014-09-26 15:18:20 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
2014-09-26 14:53:06 -07:00
Dianne Hackborn
f051b703db am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev
* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
2014-09-26 20:07:46 +00:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
Paul Lawrence
6ab202a1a9 am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev
* commit '3f105532ddfd55dc9fa287bf03a751922df3bd9d':
  Don't set dev.bootcomplete until interacting with user
2014-09-26 19:42:59 +00:00
Kenny Guy
c0ee08d3c4 am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev
* commit '25be3cd6719af42c41a6a99eea1034b00f39a825':
  Uninstall for all users should check device admins.
2014-09-26 19:42:38 +00:00
Dianne Hackborn
2f1993ec46 Fix issue #17671802: "content" command always prints...
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager.  Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
2014-09-26 11:28:01 -07:00
Paul Lawrence
3cedef53ce Merge "Don't set dev.bootcomplete until interacting with user" into lmp-dev 2014-09-26 17:58:26 +00:00
Paul Lawrence
95cce9f382 Don't set dev.bootcomplete until interacting with user
Specifically we want to not set it when encrypting and showing
progress.

Bug: 17606949
Change-Id: I668cf47781011e7fcea7aa3b43c7783b3dea77a1
2014-09-26 10:16:45 -07:00
xinhe
3d4834f0eb Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 2014-09-26 16:47:04 +00:00
Kenny Guy
a2b48057e1 Merge "Uninstall for all users should check device admins." into lmp-dev 2014-09-26 16:36:43 +00:00
xinhe
e9f1640b6b Support multiple SIM/Subscription on telephony registration
During calling telephony registry call back API, we force the call back will be
triggered if the registered subId is Default Sub ID. This is due to some risk
condition. Please refer to Issue 17472622 and its fix. This fix is ok for single
SIM/Subscription. However, on multiple SIM/subscription, there is potential problem
on wrong notifications.

Bug:17613629
Change-Id: I3f41e03f37424bcc82a71090d4f4142b4c5ba922
2014-09-25 18:52:58 -07:00
Dianne Hackborn
2d1cc18763 Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev 2014-09-26 01:41:54 +00:00
Dianne Hackborn
cd97c96734 Fix issue #17574819: Chrome browser process is killed...
...in background due to dying renderer process

Completely turn this off, for now.

Change-Id: I028eefc9b7e627d29569ef72d9ab940ac5960c7c
2014-09-25 18:34:02 -07:00
Svetoslav
54b0a05b00 Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev 2014-09-26 01:28:36 +00:00
Svetoslav
3f92ffc369 Invalid active window if temporary disabling accessibility for test tools.
If accessibility is enabled and a test tool based on the accessibility APIs
connects to the system we suspend the current accessibility services while
the tool is running (to avoid inteference as the tool is such a service) and
after the tool disconnects we restore the accessibility state. The issue is
that when clearing the accessibility state we were also wrongly clearing the
active window. We are now careful to not clear the active window in such a
case.

It is also possible that the active window was never initilaized before the
tool is run so now it is lazily loaded such that if we do not know which one
it is, we get the one the has input focus. The definition of an active window
is the one that has input focus or the user is touching.

bug:17663432

Change-Id: I8868866a5126c590d3bddad099ababb97978227a
2014-09-25 16:57:11 -07:00
Dianne Hackborn
f3ac946317 Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev 2014-09-25 23:53:14 +00:00
Dianne Hackborn
2ca21efdde Fix issue #17661444: Persistent service not automatically restarted
The code to recover when running processes are removed from the
LRU list turned up an existing problem where we would remove a
persistent process from the LRU list, making it more obvious.

Now it is fixed.

Change-Id: I94ccb924b3e5649b2819d3392b6f6c9c725dc903
2014-09-25 16:46:50 -07:00
Svetoslav
471157821f Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev 2014-09-25 23:27:01 +00:00
Svetoslav
dd81183bbe Accessibility in bad state after using SDK tool uiautomatorviewer.
The UiAutormator tool is a part of the SDK. If it is run while
accessibility is enabled it stops all accessibility services
as it is an accessibility service itself to avoid interference
and when done restores back the accessibility state. The issue
was that the accessibility state is not restored leaving the
device in a bad state.

bug:17662770

Change-Id: I3c4f46fa05c76b874eeffdeb867ef433c3fedf2e
2014-09-25 15:56:31 -07:00
Michael Wright
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18:20 +00:00
Svetoslav
57ce30ddfe Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 2014-09-25 20:06:20 +00:00
Kenny Guy
5dde6e334d Uninstall for all users should check device admins.
Uninstall for all users should check whether package
is admin for any user not just user 0.

Bug: 17657954
Change-Id: Ia116248b5889fc02dd46816a132e03c8e62662c9
2014-09-25 20:04:22 +01:00
Kenny Guy
baa05930ec Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 2014-09-25 16:42:11 +00:00
Kenny Guy
be16357f40 Ignore badly formed ComponentNames when loading device_owner.xml
In the past we wrote out badly formed ComponentNames with no
class part. Loading these results in a null pointer exception
blocking boot.

Bug: 17652534
Change-Id: Iec592343425a23c7ada5f73cf30b8646d31eae81
2014-09-25 17:03:53 +01:00
Christoph Studer
e1b032a840 Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 2014-09-25 10:53:47 +00:00
Svetoslav
8aeb091294 Accessibility events may be fired even if no services observe them.
If all accessibility services are disabled we turn off event firing
to avoid a lot of work for nothing. The logic to do that had a flaw
and was not turning event firing off in every case it should. We were
tuning event firing if it is on and no service is enabled but it
is possible that a package on the system image is disabled so the
service is enabled just not bound. Arguably we can remove the
serivice from the enabled list but it is technically on the device.
Note that we correctly handle the case of a package being removed.

bug:17332506

Change-Id: I6d6d9cb9cc271116a3d22ed9fd8d7f533dec9a0b
2014-09-24 17:55:53 -07:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
RoboErik
143dc769ef Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 2014-09-24 21:35:56 +00:00
Dianne Hackborn
fae2aabc30 Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 2014-09-24 21:06:47 +00:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data.
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
2014-09-24 13:58:09 -07:00
Dianne Hackborn
b294eac086 Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 2014-09-24 20:44:18 +00:00
Dianne Hackborn
337abb3b4e Fix issue #17614141: Add protection for accessing images
Add basic filename protection, also only file names that are for
app icons so this can't be abused to access thumbnails.

Change-Id: I2831c0f3f08a39aa734f93f76b6fd4aaf97e87c6
2014-09-24 12:44:29 -07:00
Chet Haase
ee9d415f9b Merge "Avoid drawing the starting window twice" into lmp-dev 2014-09-24 18:31:07 +00:00
Dianne Hackborn
ff072725e3 Work on issue #17624121: Settings crash while launching on wiped device
Cleaner paths and better error reporting when a problem goes wrong
while binding an application.  This gets rid of the (recently added)
error about removing a process that hasn't been killed, and cleanly
kills the process along with more detailed errors about where things
failed.

Change-Id: I710a209c14da1515929e6254396b793177eee115
2014-09-24 10:56:28 -07:00