Commit Graph

20324 Commits

Author SHA1 Message Date
Craig Mautner
c139a41ce7 am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev
* commit 'd6770a0cab31dec87c12d5d8cfaaad96d65ed828':
  Call Surface.release() for starting windows
2014-10-01 15:15:28 +00:00
Jeff Sharkey
3de5ed51d6 am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev
* commit '7bd4aba1a81538897fc173a824b6e8eec568f945':
  Clear ident when obtaining provider across users.
2014-10-01 15:15:10 +00:00
Svetoslav
344ffbc647 am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
* commit '567c97881b1d1719d32daaf647979e47e01be438':
  Use default encryption password if an accessibility service is enabled.
2014-10-01 15:15:03 +00:00
Craig Mautner
d6770a0cab am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev
* commit '4fb4163f4c6f49eebc34d1b193c526558af0d375':
  Call Surface.release() for starting windows
2014-10-01 15:01:57 +00:00
Jeff Sharkey
7bd4aba1a8 am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev
* commit 'b27d43a8805769f9a9dfdc024b5cd19b71cfd8d7':
  Clear ident when obtaining provider across users.
2014-10-01 15:01:05 +00:00
Svetoslav
567c97881b am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
2014-10-01 15:00:44 +00:00
Matthew Williams
9a957e0904 am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
* commit 'd55d3c597a889ec1ac5b0fc1248a605fc49f5d38':
  Fix deadlock caused by clearAllBackoffs in SSE
2014-10-01 00:59:20 +00:00
Lorenzo Colitti
5e7f08f513 am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
* commit '6c1d0e07840d124921fd30f04ad11b409ea73b3e':
  Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:59:16 +00:00
Jean-Michel Trivi
9f1bca5f21 am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
* commit '0ed179d185bc976779c6959b4d2d11c19538e60b':
  Send volume keys to the default stream if not actually playing
2014-10-01 00:58:55 +00:00
Matthew Williams
d55d3c597a am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
  Fix deadlock caused by clearAllBackoffs in SSE
2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784 am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
  Update LegacyTypeTracker state before sending connect broadcasts.
2014-10-01 00:52:34 +00:00
Jean-Michel Trivi
0ed179d185 am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev
* commit '4a154af9aad13c09821ada6187440feaec2d38e8':
  Send volume keys to the default stream if not actually playing
2014-10-01 00:51:32 +00:00
Craig Mautner
4fb4163f4c Merge "Call Surface.release() for starting windows" into lmp-dev 2014-09-30 22:47:05 +00:00
Wink Saville
fdadab4b5a Merge "Fix concurrent access violation." into lmp-mr1-dev 2014-09-30 22:30:05 +00:00
Etan Cohen
a33cf075fa Fix concurrent access violation.
Change-Id: I8586629cafe585135f0f72ba011b65f81242fc22
2014-09-30 22:23:49 +00:00
Craig Mautner
49a2edf92a Call Surface.release() for starting windows
If the window maanger received BinderDied for a starting window
before activity manager then it would null
AppWindowToken.startingWindow and not go through the
PhoneWindowManager.removeStartingWindow call later. That meant that
Surface.release() was never called from
ViewRootImpl.dispatchDetachedFromWindow(). Which in turn meant that
graphics memory was being leaked.

This change notifies the PhoneWindowManager to go through the
removeStartingWindow path when the starting window gets removed for
any reason.

This change also ensures that scheduleRemoveStartingWindow is
always called with the window manager lock held.

Fixes bug 17381033.

Change-Id: Ic6860d0e1410c9bb5053d85ae21a08b11f573b6d
2014-09-30 15:05:37 -07:00
Jeff Sharkey
b27d43a880 Merge "Clear ident when obtaining provider across users." into lmp-dev 2014-09-30 21:10:49 +00:00
Jeff Sharkey
c0322ecda5 Clear ident when obtaining provider across users.
When calling getContentProvider() across user boundaries, and
creating the provider for the first time, we need to clear caller
identity.  (We could have torn down the provider while the system
was under memory pressure.)

Bug: 17409650
Change-Id: I67713a03e5f7106f5e8fcf33fe3fdae81ce644ec
2014-09-30 14:01:32 -07:00
Svetoslav
44d4eeaa48 Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 2014-09-30 20:01:04 +00:00
Svetoslav
16e4a1aade Use default encryption password if an accessibility service is enabled.
When device is encrypted the user has to authenticate in order to decrypt
the data partition which is required for running accessibility services
and Text-To-Speech. In order to address this issue we are falling back
to use the default password if there is an enabled accessibility service
and the user has secure lock. This will enable the user to authenticate
when accessibility layer is completely functional.

bug:17671790

Change-Id: Iafffe7bcd234008cf91ffb5011b21b803dca227a
2014-09-30 13:00:11 -07:00
RoboErik
80aa626e04 am a65a4f64: am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
* commit 'a65a4f64e6206c370bce79d74753f6f67bc4b4e0':
  Be more paranoid about threading in MediaSessionRecord
2014-09-30 16:43:43 +00:00
RoboErik
a65a4f64e6 am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev
* commit '9eef5bf8d1a69879ada3176c839676dc82b14daf':
  Be more paranoid about threading in MediaSessionRecord
2014-09-30 16:32:03 +00:00
Jungshik Jang
8dff369838 Merge "Update CEC keycode repeat status." into lmp-mr1-dev 2014-09-30 04:47:56 +00:00
Matthew Williams
bc156ba430 Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 2014-09-30 03:09:10 +00:00
Lorenzo Colitti
d8f7e04828 Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 2014-09-30 03:05:49 +00:00
Jean-Michel Trivi
4a154af9aa Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 2014-09-30 00:11:14 +00:00
RoboErik
165809b331 Send volume keys to the default stream if not actually playing
This ensures that we'll only adjust volume on a session's stream if
that stream is actually in use.

bug:17690423
Change-Id: I5fce8265a015bbc5034afa16719d9a0bbf257598
2014-09-29 14:43:10 -07:00
John Spurlock
eeac1f1df9 am cbb732a8: am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev
* commit 'cbb732a8c449f59f88dadcacad006008b2a16207':
  Zen: Fix downtime calculation for Sunday mornings.
2014-09-29 21:03:23 +00:00
Christoph Studer
35c7eedc9a am 0bb9d832: am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev
* commit '0bb9d8327500c265c2efd82449db23421cd70d83':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
2014-09-29 21:01:43 +00:00
Paul Jensen
5aa788a61f am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony.
* commit 'a621a97f4a05891a514ba5343c9db04d125e1eb8':
  Move mobile provisioning APN support into telephony.
2014-09-29 21:01:08 +00:00
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
RoboErik
9eef5bf8d1 Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev 2014-09-29 20:48:11 +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
RoboErik
df382cada1 Be more paranoid about threading in MediaSessionRecord
This makes copies of objects with bundles before posting to another
thread and is more aggressive about locking before making assignments
of mutable objects.

bug:17692568
Change-Id: I28e8229718b862c485e870fd2ca06a3a18a7c454
2014-09-29 13:21:47 -07: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
Lorenzo Colitti
061f4159dc Update LegacyTypeTracker state before sending connect broadcasts.
Currently, LegacyTypeTracker sends out connected broadcasts
before updating its internal lists of networks. This creates a
race condition where an app can query LegacyTypeTracker state
(e.g., via getActiveNetworkInfo) as soon as it gets the
broadcast, and get information that has not been updated.

Bug: 17540101
Change-Id: Iefd6d5e9fd0b427c5872166208831f70fcef8b6f
2014-09-29 20:15:33 +09:00
Jungshik Jang
d825aac652 Update CEC keycode repeat status.
All function keys should be non-repeat keys.
Channel up/down key should be repeatable keys.

Bug: 17686439
Change-Id: I6c6aede13f9483c9c9b01664d6c46ea54ab6a8d0
2014-09-29 16:33:41 +09:00
Jungshik Jang
49764d45f6 Merge "Apply new Android keycodes to CEC keycode mapping." into lmp-mr1-dev 2014-09-29 05:52:59 +00:00
Jungshik Jang
fe279619db Apply new Android keycodes to CEC keycode mapping.
Bug: 17686439
Change-Id: Idc9f87863aab437cd9c5f95305862a94d662a3f4
2014-09-29 14:36:07 +09:00
jgu21
454a681fc3 am df44f764: am 20867871: Frameworks/base: Early init native bridge
* commit 'df44f764444a8676051c54cfb3e3f5fd2b8682c8':
  Frameworks/base: Early init native bridge
2014-09-29 04:20:28 +00:00
Matthew Williams
119aac93f8 Fix deadlock caused by clearAllBackoffs in SSE
BUG: 17420163
This CL is a copy of ag/359292
That commit was lost, see the bug for more details.

Change-Id: I68747d447f8c95e6b5022f9bc8cbab677e0c3d4e
2014-09-28 20:42:23 -07: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
Jungshik Jang
73483b6bc9 Support parameterized keycode in cec.
This change is to support keycode mapping between custom
android keycode and cec keycode + parameter case.

Bug: 17664826
Change-Id: I7a698655589078b8ebba96d96bff70b43d346231
2014-09-29 11:08:45 +09: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 2eacd06bfb)

Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
2014-09-28 15:35:59 -07:00
New Author Steven Liu
15d9ce3e38 am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app
* commit '1f560a7368f8e3bf6b31aec78651419e55786e18':
  redirect RIL_UNSOL_OEM_HOOK_RAW to system app
2014-09-27 07:26:47 +00:00