4223 Commits

Author SHA1 Message Date
Christoph Studer
98fc6dbef5 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-30 14:55:11 +00:00
Paul Jensen
107837aa28 am 89e0f093: Move mobile provisioning APN support into telephony.
* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
  Move mobile provisioning APN support into telephony.
2014-09-30 14:55:07 +00: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
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
93585cca97 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:24 +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
2da9e080aa 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:56 +00:00
Elliott Hughes
0844233e99 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:51 +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
Dianne Hackborn
c29de2ffb2 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 21:57:49 +00: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
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
Paul Lawrence
c05c8621bd 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:43:53 +00:00
Kenny Guy
fb81844bc6 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:43:33 +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
Kenny Guy
a2b48057e1 Merge "Uninstall for all users should check device admins." into lmp-dev 2014-09-26 16:36:43 +00:00
Dianne Hackborn
8ef17faf1c am 34b63d50: Merge "Fix issue #17574819: Chrome browser process is killed..." into lmp-dev
* commit '34b63d50c6e9e999eb8d5349084c12e907fb2d2d':
  Fix issue #17574819: Chrome browser process is killed...
2014-09-26 01:51:04 +00: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
Dianne Hackborn
b8b5bfcb1e am fcc42e8f: Merge "Fix issue #17661444: Persistent service not automatically restarted" into lmp-dev
* commit 'fcc42e8f3375a35dfc92af41fe9303359af84626':
  Fix issue #17661444: Persistent service not automatically restarted
2014-09-26 00:00:33 +00: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
Michael Wright
99ef41c47c am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
2014-09-25 23:44:08 +00:00
Michael Wright
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18: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
Christoph Studer
8465c00440 am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
* commit '78205c2b2e4f28cdafff93be2c599097b1b9f00d':
  NoMan: Add 3s timeout in matchesCallFilter()
2014-09-25 11:03:02 +00:00
Christoph Studer
e1b032a840 Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 2014-09-25 10:53:47 +00:00
Jeff Sharkey
c4997a1d9c am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
2014-09-24 23:35:37 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
Andreas Gampe
a103ebed6e resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp
Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1
2014-09-24 15:38:02 -07:00
RoboErik
e053f625f7 am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '2a638f08dc4c750bfd0e358768ddde98c7f23b09':
  Clear the volume cache for all inactive state transitions
2014-09-24 21:48:26 +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
aa2f3d68a1 am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev
* commit '2a857c633ddf2cdb02c768f9340ecb5abe468c48':
  Work on issue #17624121: Settings crash while launching on wiped device
2014-09-24 21:14:06 +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
04dec5c66d am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev
* commit '5576641a9709a03df5f4e45ac91ff94fa5b1bb18':
  Fix issue #17614141: Add protection for accessing images
2014-09-24 20:50:40 +00: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
faf1d7d865 am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev
* commit '66287788d35687a140df10ac96646cdf04f91a88':
  Avoid drawing the starting window twice
2014-09-24 18:41:14 +00: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
Robin Lee
d0a1dbc590 am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev
* commit '0a803fcc2a000985a42072db5b4c9d4917139fcf':
  Reset keystore when user is added or removed
2014-09-24 17:50:21 +00:00
RoboErik
23b113592a Clear the volume cache for all inactive state transitions
bug:16988480
Change-Id: I0426c76681f8ec832c3f72842ee494d286050fea
2014-09-24 09:36:17 -07:00
Chet Haase
8eb48d26cc Avoid drawing the starting window twice
Logic in WindowState caused a delayed layout on the starting window,
which forced another layout/draw pass, which was unnecessary. Making
the resize call happen sooner means that that request gets lumped in
with a pending layout request, so there's only one resulting draw.

This saves not only the second drawing operation, but also the creation
of an extra buffer in SurfaceFlinger for that second draw request. This
buffer is temporary, but can be quite large on some devices and push
the system over the memory edge in extreme situations. It's difficult
to track this memory usage difference as the buffer resides at a very
low level in the system. But you can see in systrace that the second
allocation (and the second draw) is not happening after the fix.

Issue #17570761 Constrain starting window to only one buffer

Change-Id: I0e0fff7efdc812730706afccbfb020dea3f8d3e2
2014-09-24 07:31:29 -07:00
Christoph Studer
12aeda802e NoMan: Add 3s timeout in matchesCallFilter()
In Priority mode, NoMan can block the telecom Ringer
indefinitely when looking up the caller contact details via
ContactsProvider.

Fix this by introducing a 3s timeout and assume the call
matches the call filter when the timeout is hit.

Bug: 17598245
Change-Id: Ia0893cf203e6ffd943c749719ebb9e0f0958eb01
2014-09-24 14:55:32 +02:00