drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,089 Commits 1 Branch 0 Tags
Commit Graph

11604 Commits

Author SHA1 Message Date
Craig Mautner
2b02564bfd am fa5bc081: Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev 
* commit 'fa5bc081593891959c143e0de9e59dd076a47b42':
  Increase window freeze timeout for bigger screens.
 2012-10-10 12:44:23 -07:00
Craig Mautner
fa5bc08159 Merge "Increase window freeze timeout for bigger screens." into jb-mr1-dev 2012-10-10 12:42:18 -07:00
Jean-Michel Trivi
d677054ca6 Don't play notifications during speech recognition 
Add support for querying AudioManager to know whether speech
 recognition is currently underway.

Don't play a notification if speech recognition is underway.

Bug 7314859

Change-Id: I1bd013a3168cfe1a6b6dcfd28565e1c3c512eb6a
 2012-10-10 12:03:41 -07:00
Craig Mautner
7dfcb01820 Increase window freeze timeout for bigger screens. 
More pixels take longer. Timeout was occurring before Status and
Navigation Bars were finished drawing causing them to animate in
during rotations.

Bug 7307718 fixed.

Change-Id: Iccf27b6172d0c9831690cc2fcf93027a40b705d8
 2012-10-10 10:24:47 -07:00
Zhihai Xu
7717e48584 am 859dbd89: am 5ac58157: am 25144566: Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 
* commit '859dbd89df773f1ace87419462c52b620745d46f':
  Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
 2012-10-10 09:59:27 -07:00
Zhihai Xu
859dbd89df am 5ac58157: am 25144566: Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 
* commit '5ac58157376194f7e9fb19fe4cda65cdbf859155':
  Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
 2012-10-10 09:57:06 -07:00
Zhihai Xu
5ac5815737 am 25144566: Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 
* commit '251445667ce045c4425c10fb24e3e23f90a210c0':
  Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched
 2012-10-10 09:55:41 -07:00
Zhihai Xu
251445667c Merge "Bluetooth multi-user updates: change bluetooth manager system service to reject background user access. disable and enable Bluetooth when user is switched" into jb-mr1-dev 2012-10-10 09:52:33 -07:00
Jeff Brown
22808eef52 am 280e50f1: am 3f0d9580: am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev 
* commit '280e50f197e6c8ba52a05982fb2ce2cb2a8071fb':
  Don't consider the boot completed until the animation is over.
 2012-10-10 08:42:19 -07:00
Jeff Brown
280e50f197 am 3f0d9580: am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev 
* commit '3f0d9580210d96f9cd1b440c6754d5e30cbd387d':
  Don't consider the boot completed until the animation is over.
 2012-10-10 08:38:07 -07:00
Jeff Brown
3f0d958021 am f6138f07: Merge "Don\'t consider the boot completed until the animation is over." into jb-mr1-dev 
* commit 'f6138f0720e678f236fe8c442a7660a955da9d10':
  Don't consider the boot completed until the animation is over.
 2012-10-10 08:33:57 -07:00
Jeff Brown
f6138f0720 Merge "Don't consider the boot completed until the animation is over." into jb-mr1-dev 2012-10-10 00:35:20 -07:00
Dianne Hackborn
3c30494d44 am 572286b4: am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '572286b4152245a73ac00ebc69b4bd8fc4bc586d':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:17:09 -07:00
Dianne Hackborn
572286b415 am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '31af905ac5388339fd0ffd87e6f25bd2a293dc0e':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:14:24 -07:00
Dianne Hackborn
31af905ac5 am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 
* commit '36db9d0879640a1cb9a8723d6649068a1c4c08de':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...
 2012-10-09 19:13:13 -07:00
Zhihai Xu
40874a096b Bluetooth multi-user updates: change bluetooth manager system service 
to reject background user access. disable and enable Bluetooth when user is switched

bug 6925422

Change-Id: I52136e707da2d1ba8228c1bb8beef1414ead1893
 2012-10-09 19:10:14 -07:00
Jeff Brown
20767b2d1e Don't consider the boot completed until the animation is over. 
This fixes a problem where the screen times out shortly after
boot before the user has had a chance to interact with the device.
Now we wait until the boot animation has completed then set
boot completed, poke user activity and start the countdown.

Bug: 7316397
Change-Id: Ie5a0b1012d265e655d33cc8fba49ca349f48f1de
 2012-10-09 19:06:25 -07:00
Dianne Hackborn
c0bd747b06 Further work on issue #7307399: Framework needs a new pre-user-shutdown... 
...phase & callback API

I realized there were a few things wrong with what was there.  The new
ACTION_USER_STARTING was not being sent for the first user at boot, and
there was an existing problem where ACTION_USER_STARTED was sent every
time there was a user switch.

Also improved some debug output of broadcasts to make it easier to see
what is going on in this stuff, and better reporting of why a service
couldn't be started.

Change-Id: Id8a536defbbad1f73d94a37d13762436b822fbe3
 2012-10-09 17:57:14 -07:00
Dianne Hackborn
96a739737f am 7beb70a9: am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 
* commit '7beb70a94af2ce29b4184fd7927bba93d90cf878':
  Fix issue #7311376: Add API to allow apps to know if they are...
 2012-10-09 17:53:13 -07:00
Dianne Hackborn
7beb70a94a am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 
* commit 'e54566457869a15d606870c230662b76c02456cb':
  Fix issue #7311376: Add API to allow apps to know if they are...
 2012-10-09 17:51:13 -07:00
Dianne Hackborn
e545664578 am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 
* commit '840590dd642719f402491092944a12475d6d6a8e':
  Fix issue #7311376: Add API to allow apps to know if they are...
 2012-10-09 17:49:11 -07:00
Dianne Hackborn
840590dd64 Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 2012-10-09 17:46:36 -07:00
Eric Laurent
7f20792aed am 6ee2d3c7: am 5dfd668e: am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev 
* commit '6ee2d3c744459ffe9dccbcea146298b4cd3ffbd2':
  fix concurrent headset and HDMI connection
 2012-10-09 17:31:39 -07:00
Eric Laurent
6ee2d3c744 am 5dfd668e: am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev 
* commit '5dfd668e9fa09760e59293e18f433d917cf42b38':
  fix concurrent headset and HDMI connection
 2012-10-09 17:29:00 -07:00
Eric Laurent
5dfd668e9f am 6f2cdcdb: Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev 
* commit '6f2cdcdbe4096565434c31cf4fe3c782c38f1ce1':
  fix concurrent headset and HDMI connection
 2012-10-09 17:27:36 -07:00
Craig Mautner
22ed74e9ba am 73b9752a: am c95478cc: am 0cd64100: Merge "Remove debugging statements before final ROM." into jb-mr1-dev 
* commit '73b9752a003bdc1bd0a5c066db506f2b46731888':
  Remove debugging statements before final ROM.
 2012-10-09 17:25:44 -07:00
Eric Laurent
6f2cdcdbe4 Merge "fix concurrent headset and HDMI connection" into jb-mr1-dev 2012-10-09 17:25:27 -07:00
Craig Mautner
73b9752a00 am c95478cc: am 0cd64100: Merge "Remove debugging statements before final ROM." into jb-mr1-dev 
* commit 'c95478cc9abe6229f078b6d8ebea8a9c795cbc78':
  Remove debugging statements before final ROM.
 2012-10-09 17:24:04 -07:00
Craig Mautner
c95478cc9a am 0cd64100: Merge "Remove debugging statements before final ROM." into jb-mr1-dev 
* commit '0cd641001a152893642b702446bb12c7c0c08e48':
  Remove debugging statements before final ROM.
 2012-10-09 17:21:47 -07:00
Craig Mautner
0cd641001a Merge "Remove debugging statements before final ROM." into jb-mr1-dev 2012-10-09 17:18:30 -07:00
Jeff Brown
b5bfe3751b am a047faed: am a003f8c6: am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev 
* commit 'a047faed5a78635e23cca6cbc235fdbb53bd0d82':
  Prevent full wake lock from keeping device awake while dreaming.
 2012-10-09 17:02:06 -07:00
Dianne Hackborn
a8a9bd65bf Fix issue #7311376: Add API to allow apps to know if they are... 
...running as the foreground user

Add UserManager.isUserRunning() which is the public version of the
existing method on ActivityManager.

Also add UserManager.isUserRunningOrStopping() since that seems like
it will be useful.

And fix the internal function that returns the array of currently
running users to not include stopped users.

Change-Id: I84672fa8748fc027fd402729586b5603f640e498
 2012-10-09 17:00:31 -07:00
Jeff Brown
2ea9c0ca33 am 329a5a90: am 07d655e6: am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev 
* commit '329a5a90e491efaab84055e94896385547df9c41':
  Fix a segfault when there is no power module.
 2012-10-09 16:59:58 -07:00
Jeff Brown
a047faed5a am a003f8c6: am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev 
* commit 'a003f8c6e62181d803b019267e27ea12498bef4a':
  Prevent full wake lock from keeping device awake while dreaming.
 2012-10-09 16:59:46 -07:00
Jeff Brown
329a5a90e4 am 07d655e6: am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev 
* commit '07d655e68dc6f604fea1292b8ebc402dd0166f9c':
  Fix a segfault when there is no power module.
 2012-10-09 16:57:50 -07:00
Jeff Brown
a003f8c6e6 am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev 
* commit 'f545660dcb54f90ad6a79ef0d7dccb509dc69017':
  Prevent full wake lock from keeping device awake while dreaming.
 2012-10-09 16:57:15 -07:00
Jeff Brown
07d655e68d am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev 
* commit '637a30fde7d1754f8b8a76c08326e1c432ffd93d':
  Fix a segfault when there is no power module.
 2012-10-09 16:54:26 -07:00
Jeff Brown
f545660dcb Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev 2012-10-09 16:54:12 -07:00
Jeff Brown
637a30fde7 Merge "Fix a segfault when there is no power module." into jb-mr1-dev 2012-10-09 16:51:49 -07:00
Eric Laurent
9e6e8355f8 fix concurrent headset and HDMI connection 
Fix a bug in WiredAccessoryManager causing an
HDMI disconnection to be signaled to AudioService when a
headset is connected.

Bug 7313250.

Change-Id: I7c6446104c55f9a4fc146abe7020df45ad6ba5e7
 2012-10-09 16:41:32 -07:00
Jeff Brown
10428748f9 Prevent full wake lock from keeping device awake while dreaming. 
A dream may itself hold a wake lock in order to keep the screen
bright as it runs.  However this wake lock also causes the device
to stay awake even when it is not plugged in which is undesirable.

This change makes full wake locks behave differently when napping
or dreaming.  The wake lock still keeps the screen bright but
it does not prevent the device from falling asleep.  This is
similar to our policy of ignoring full wake locks completely when
the device is manually put to sleep by the user.

Bug: 7295909
Change-Id: Id99e82d2143ae1a81629281d6407d7527efb8137
 2012-10-09 15:52:31 -07:00
Kenny Root
cde5343459 am 921d4455: am e8b90ef4: am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev 
* commit '921d445584cabdc8bab29bfc4df8160e60ff55f9':
  Add fused location provider to real provider list
 2012-10-09 15:28:59 -07:00
Kenny Root
921d445584 am e8b90ef4: am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev 
* commit 'e8b90ef442e3f2077b827d6657f8201d87a80cc8':
  Add fused location provider to real provider list
 2012-10-09 15:26:11 -07:00
Kenny Root
e8b90ef442 am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev 
* commit 'a8a6b0848d1c11c3ed0fcb846e3d6c39b91536a0':
  Add fused location provider to real provider list
 2012-10-09 15:23:58 -07:00
Kenny Root
a8a6b0848d Merge "Add fused location provider to real provider list" into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Jeff Brown
0a19d001c4 Fix a segfault when there is no power module. 
This can happen in the emulator.

Bug: 7315152
Change-Id: I4a3f547127419fcd4dc4fc1c6f7ee869706cf12e
 2012-10-09 14:47:05 -07:00
rich cannings
490f8d0a5c am 8f022057: am dcecd6f3: am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 
* commit '8f02205740e0522feb49ffdd88db86985f10799c':
  Fix verfication bypassed for adb installs
 2012-10-09 14:17:45 -07:00
rich cannings
8f02205740 am dcecd6f3: am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 
* commit 'dcecd6f3b3e2f0021bf5668ded122214ec51f786':
  Fix verfication bypassed for adb installs
 2012-10-09 14:15:19 -07:00
rich cannings
dcecd6f3b3 am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 
* commit 'f1b246ddfed6757180768eea080b80c1538333f3':
  Fix verfication bypassed for adb installs
 2012-10-09 14:13:13 -07:00
rich cannings
f1b246ddfe Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 2012-10-09 14:11:21 -07:00