Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,868 Commits 3 Branches 0 Tags
c4b4ffb808de03e8efcabd8cd96a192261baec0a
Commit Graph

21040 Commits

Author SHA1 Message Date
Matthew Williams
c926b2f175 am 99771e9e: am 9a957e09: am d55d3c59: am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit '99771e9ea7e68eb8a7578361d5ee24a037dc382d':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 01:43:15 +00:00
Lorenzo Colitti
505315d6c6 am 2f82b128: am 5e7f08f5: am 6c1d0e07: am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit '2f82b128afd3b5540097ee88ec3df86a31938f3c':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 01:43:11 +00:00
Jean-Michel Trivi
40a47f6dd7 am 4b495477: am 9f1bca5f: am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '4b495477d957cef0b0e199674d63b6147a3c4e58':
  Send volume keys to the default stream if not actually playing
 2014-10-01 01:42:42 +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
Wink Saville
09e45d80ca am 0312c079: am fdadab4b: Merge "Fix concurrent access violation." into lmp-mr1-dev 
* commit '0312c0797a13db08425cd4435c06868c0ac7ec04':
  Fix concurrent access violation.
 2014-09-30 22:40:32 +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
RoboErik
ce1a588e60 am f614ecff: am 80aa626e: am a65a4f64: am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev 
* commit 'f614ecffa821776fdbba9d6dd0195b52de4f8c55':
  Be more paranoid about threading in MediaSessionRecord
 2014-09-30 21:10:27 +00: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
52083aa823 am 61ee8979: am 8dff3698: Merge "Update CEC keycode repeat status." into lmp-mr1-dev 
* commit '61ee8979ded518b5a361a188ff72d60ca2a0908f':
  Update CEC keycode repeat status.
 2014-09-30 16:12:47 +00:00
John Spurlock
457768ffc1 am f2faae22: am eeac1f1d: am cbb732a8: am 39838b98: Merge "Zen: Fix downtime calculation for Sunday mornings." into lmp-dev 
* commit 'f2faae228e669504edcf35483c91d437ceb72964':
  Zen: Fix downtime calculation for Sunday mornings.
 2014-09-30 16:12:34 +00:00
Christoph Studer
6849698fd9 am 7080a5f6: am 35c7eedc: am 0bb9d832: am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev 
* commit '7080a5f68e85b598b176d2ed548ad51ba89fd60d':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
 2014-09-30 16:11:44 +00:00
Paul Jensen
1bf1ef5ae9 am 52786d9b: am 5aa788a6: am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony. 
* commit '52786d9bc115b7cd37335c1f408fdf68e784ac41':
  Move mobile provisioning APN support into telephony.
 2014-09-30 16:11:23 +00:00
Jungshik Jang
6c041f6544 am 123f496b: am 49764d45: Merge "Apply new Android keycodes to CEC keycode mapping." into lmp-mr1-dev 
* commit '123f496b8bd40ac1c90bbf81f2178a2144e8f369':
  Apply new Android keycodes to CEC keycode mapping.
 2014-09-30 16:11:19 +00:00
Jungshik Jang
b4bd69d307 am eb6724d5: am 73483b6b: Support parameterized keycode in cec. 
* commit 'eb6724d530160e802c0209b2f0bcfafa540d294e':
  Support parameterized keycode in cec.
 2014-09-30 14:57:06 +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
Andreas Gampe
184e3ed0f0 resolved conflicts for merge of 6290c048 to lmp-mr1-dev-plus-aosp 
Change-Id: I2551a233079c2be562ba37dc7413d59ce4e7bf83
 2014-09-29 15:10:23 -07: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
Andreas Gampe
6290c048e1 am 207cffe9: Merge "Frameworks/base: Fix services/jni warnings" 
* commit '207cffe95a868ea21b74dd54e3ef7821162ce870':
  Frameworks/base: Fix services/jni warnings
 2014-09-29 20:43:15 +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
Andreas Gampe
207cffe95a Merge "Frameworks/base: Fix services/jni warnings" 2014-09-29 18:10:26 +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
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