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

106582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
eb46064c6f am 77d7e0a3: am 3676cbb6: am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '77d7e0a36234b8981c25232d6c35b4fd64d1c083':
  update homepage with IO Live banner
 2013-05-09 23:40:41 -07:00
Jim Miller
8f1b2e0b7f am 00553835: Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev 
* commit '0055383554983842c5d7bab25a981c6eb804a38c':
  Attempt to fix NPE in keyguard
 2013-05-09 23:40:30 -07:00
Dianne Hackborn
e8c9b39ec9 am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 
* commit '83d6df27d40aed18a7dc42c9320f83656cc81ea0':
  Help on issue #8863955: Google Services keeping phone awake...
 2013-05-09 23:40:28 -07:00
Elliott Hughes
92393d8518 Merge "Update nomenclature." into jb-mr2-dev 2013-05-10 05:30:26 +00:00
Jeff Brown
a27b8fb429 Add an API to determine if a route is connecting. 
Bug: 8175766
Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
 2013-05-09 21:56:42 -07:00
Dianne Hackborn
f6438b16ba Eradicate basically all of the system reboot stuff in the watchdog. 
This was implemented for 1.0 out of paranoia about the possibility
of needing to schedule reboots of the system after it went out in
the field, which I am happy to say was never ever used.

Let's get rid of it.

A small stub is left, to still service the API that allows people
to send a reboot broadcast to have the system immediately reboot.

Change-Id: I6731b24a28340e50c8015f8cb28e48f74f69f9b7
 2013-05-09 18:53:48 -07:00
Amith Yamasani
e8e93a143e Fix build error due to incorrect merge 
Keyguard package was moved, so a new file didn't get to the right directory.

Change-Id: I2cdf2d9ef785ca7852c38278f51b5af9f96320f7
 2013-05-09 18:12:30 -07:00
Dirk Dougherty
cf30f631cf am 3f14b556: am cf90471a: am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit '3f14b556a30f4ae8026f05dadfa54c4d68ff926b':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 18:04:05 -07:00
Scott Main
77d7e0a362 am 3676cbb6: am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '3676cbb61a4c59957c2a8cb3a257ff2ce0a02597':
  update homepage with IO Live banner
 2013-05-09 18:04:00 -07:00
Dirk Dougherty
3f14b556a3 am cf90471a: am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'cf90471aff7b43a8c0ebc32298b20d31d4e767a3':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 18:02:19 -07:00
Scott Main
3676cbb61a am 054215d1: am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '054215d1a9d5e0f814388c235124f776fd3f42b6':
  update homepage with IO Live banner
 2013-05-09 18:02:16 -07:00
Dirk Dougherty
cf90471aff am f1456dea: am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'f1456deaa85a999d2c10bc92642613c97782fd98':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 17:59:50 -07:00
Scott Main
054215d1a9 am d948cb49: am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit 'd948cb496fb8e0941046457cd3321a0fbcadcbff':
  update homepage with IO Live banner
 2013-05-09 17:59:47 -07:00
Dirk Dougherty
f1456deaa8 am a48a2d16: am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit 'a48a2d16ef042466048eaff25542ea903711bff0':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 17:56:27 -07:00
Scott Main
d948cb496f am 8f820209: am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '8f8202095e8f4cd167b499ca19ebccda63f04c0c':
  update homepage with IO Live banner
 2013-05-09 17:56:24 -07:00
Dirk Dougherty
a48a2d16ef am 4da9c11b: Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 
* commit '4da9c11b2758d55c67f7a24c3eb519c36497ba5d':
  Doc change: refresh gms/gcm reference docs.
 2013-05-09 17:53:37 -07:00
Scott Main
8f8202095e am 4e3773d3: Merge "update homepage with IO Live banner" into jb-mr1.1-docs 
* commit '4e3773d3f626595c703d26dea1f354c37ad76bde':
  update homepage with IO Live banner
 2013-05-09 17:53:34 -07:00
Dirk Dougherty
4da9c11b27 Merge "Doc change: refresh gms/gcm reference docs." into jb-mr1.1-docs 2013-05-10 00:37:51 +00:00
Dirk Dougherty
4af1bf8d20 Doc change: refresh gms/gcm reference docs. 
Change-Id: Ife17b6b3dfb387bc7de6c827c0e6db19a756534f
 2013-05-09 17:30:29 -07:00
Jeff Brown
89efc6e6c1 am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
  Add an API to allow a callback to request active scans.
 2013-05-09 17:09:24 -07:00
Jeff Brown
1f59cbb20a am 507a3c77: am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '507a3c77d583643f4a884c5d7b0c5e6bce3222bb':
  Fix bug managing wifi display routes.
 2013-05-09 17:09:22 -07:00
Amith Yamasani
980c49d307 Merge "resolved conflicts for merge of 069d7e9b to master" 2013-05-10 00:08:25 +00:00
Amith Yamasani
ecd5afe1ef resolved conflicts for merge of 069d7e9b to master 
Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
 2013-05-09 17:07:08 -07:00
Jim Miller
0055383554 Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev 2013-05-10 00:03:56 +00:00
Chris Craik
d4b43b3cf3 Fix off by one error in log tracking 
bug:8875715

Additionally moves op logging before the op is executed, to print
correctly, in pre-order traversal

Change-Id: I4e9566261f8363c73739d183e6d82b854f72ffad
 2013-05-09 17:00:46 -07:00
Mathias Agopian
1519882f52 Merge "surfaceflinger is now always running in its own process" 2013-05-09 23:58:42 +00:00
Dianne Hackborn
83d6df27d4 Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 2013-05-09 23:47:22 +00:00
Scott Main
4e3773d3f6 Merge "update homepage with IO Live banner" into jb-mr1.1-docs 2013-05-09 23:30:09 +00:00
Chet Haase
2d4edcf2e1 am a9d5adea: am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 
* commit 'a9d5adea9e9676d19b7a50ce3d6c673c16ee7a6d':
  Fix start delay jank in ViewPropertyAnimator
 2013-05-09 16:28:33 -07:00
Matthew Xie
b50619cc14 am c0c7cebe: am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 
* commit 'c0c7cebe3f5da99aeb48eb62bffbaf3183814194':
  Donot bind to GATT service when BLE is not supported
 2013-05-09 16:28:30 -07:00
Jeff Brown
da58f92bfa am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
  Add an API to allow a callback to request active scans.
 2013-05-09 16:23:43 -07:00
Jeff Brown
507a3c77d5 am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '2298d68e72afa9cf311af394b61f92f75385bbbf':
  Fix bug managing wifi display routes.
 2013-05-09 16:23:40 -07:00
Jim Miller
982d21b9dc Attempt to fix NPE in keyguard 
This attempts to fix a bug where it looks like we have null content in
one of the widget pages in keyguard.

Based on the bug description, it's likely the transport control was just
removed from the view hierarchy.  Not sure how the content can be null
in this case, but this will hopefully prevent the crash and give us some
insight into what caused it.

Fixes bug 8886916

Change-Id: I22c26c49f22fa5b06987e8199070a9aaead2ff8a
 2013-05-09 16:23:34 -07:00
Amith Yamasani
069d7e9b81 am 153919ed: Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev 
* commit '153919ed2f128fb5d1b55782ea89fadcc20fc841':
  Cache the scaled avatar drawables in the keyguard user switcher
 2013-05-09 16:23:31 -07:00
Chet Haase
a9d5adea9e am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 
* commit 'fb32c82412111983236f44cbc8fd90f113d7ea34':
  Fix start delay jank in ViewPropertyAnimator
 2013-05-09 16:23:29 -07:00
Matthew Xie
c0c7cebe3f am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 
* commit 'b566c466c73d351d01e64d1c9ba609133efc4ffd':
  Donot bind to GATT service when BLE is not supported
 2013-05-09 16:23:26 -07:00
Jeff Brown
b2f6842d55 Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 2013-05-09 23:04:26 +00:00
Jeff Brown
2298d68e72 Merge "Fix bug managing wifi display routes." into jb-mr2-dev 2013-05-09 23:03:58 +00:00
Marco Nelissen
13bfebd6b7 Add VideoView.getAudioSessionId() 
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/8767565

Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
 2013-05-09 15:50:38 -07:00
Dianne Hackborn
b14e42f121 Merge "Cleanup some of the thread merging." 2013-05-09 22:30:30 +00:00
Dianne Hackborn
af17baa271 Help on issue #8863955: Google Services keeping phone awake... 
...because of Google Play Services

Raise the limit on the number of wake locks we track per uid.

Get rid of the separate limit for the system process, since it
now isn't any larger than the new limit for regular processes.

Change-Id: Ic10c81cad7d4ad4aabf1f53f78191a0973a1d784
 2013-05-09 15:27:47 -07:00
Amith Yamasani
153919ed2f Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev 2013-05-09 22:17:51 +00:00
Chet Haase
fb32c82412 Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 2013-05-09 22:09:18 +00:00
Mathias Agopian
4bdc882800 surfaceflinger is now always running in its own process 
Change-Id: I4e04e1aa181b3ebe661354edd0b8dbbfd7a623a6
 2013-05-09 14:57:05 -07:00
Tim Murray
da67debe22 Remove extraneous logging. 
bug 8888887

Change-Id: I68d01c2ba649257be1577d53f330ad28d3b57011
 2013-05-09 14:45:43 -07:00
Amith Yamasani
6fc1d4e8e6 Cache the scaled avatar drawables in the keyguard user switcher 
Loading the avatar icons and drawing them into the sized bitmap
turns out to be quite expensive and the cost increases with number
of users. Caching them shaves off several hundred milliseconds from
Keyguard inflation time during user switching on the lockscreen.

For instance, 15ms vs. 750ms with 3 avatars on a certain 7" tablet.

Bug: 7986933
Change-Id: I3e2065bfa25aa263133ba204ca364c3b04d7c0ff
 2013-05-09 14:44:38 -07:00
Jeff Brown
66f3b39ec4 Add an API to allow a callback to request active scans. 
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.

Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
 2013-05-09 14:44:08 -07:00
Chet Haase
dcfbd6a2c9 Fix start delay jank in ViewPropertyAnimator 
Issue #8892620 start delay jank in ViewPropertyAnimator

Change-Id: I17a57ac3351fb2c1516b594d135aa9ce9f78c88e
 2013-05-09 14:40:21 -07:00
Daniel Sandler
203a91a6ca am abd37bcf: am ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev 
* commit 'abd37bcfac84ff85dbcd719d27b014a6eb01d5e0':
  Exempt the notification panel from animation lockout.
 2013-05-09 14:19:48 -07:00
Derek Sollenberger
0c8c0add4e am c195ef73: am bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev 
* commit 'c195ef73445c3ba605355798b9f1f9a78bc52f11':
  Fix bug where we incorrectly clipped the bounds to the device size.
 2013-05-09 14:19:45 -07:00