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

91533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
f761a9a634 Merge "Doc change: edits to TV tablet story." into jb-dev-docs 2012-10-09 17:31:35 -07:00
John Spurlock
5171c9cf0c am bca3dc96: am 896fc03e: am 59a96036: Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit 'bca3dc965aa46818a23a4822f7f2e5d5a3e36619':
  Disable Camera + Search until USER_SETUP_COMPLETE.
 2012-10-09 17:31:35 -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
John Spurlock
bca3dc965a am 896fc03e: am 59a96036: Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit '896fc03ebf321e8b93e60635252888bac63e12ac':
  Disable Camera + Search until USER_SETUP_COMPLETE.
 2012-10-09 17:28:56 -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
John Spurlock
896fc03ebf am 59a96036: Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit '59a960366424a354c7ddbca9a8d6008886ca2a77':
  Disable Camera + Search until USER_SETUP_COMPLETE.
 2012-10-09 17:27:33 -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
John Spurlock
59a9603664 Merge "Disable Camera + Search until USER_SETUP_COMPLETE." into jb-mr1-dev 2012-10-09 17:24:58 -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
Irfan Sheriff
a2e1f1c00f am eba024ea: am a65430a2: am 17cf1f2b: Fix build 
* commit 'eba024eae8e7828162d01a4b12b93b78013ae24c':
  Fix build
 2012-10-09 17:21:21 -07:00
Irfan Sheriff
eba024eae8 am a65430a2: am 17cf1f2b: Fix build 
* commit 'a65430a2a5e948eaa49ec5e50f18289a75a3a54a':
  Fix build
 2012-10-09 17:19:38 -07:00
Craig Mautner
0cd641001a Merge "Remove debugging statements before final ROM." into jb-mr1-dev 2012-10-09 17:18:30 -07:00
Irfan Sheriff
a65430a2a5 am 17cf1f2b: Fix build 
* commit '17cf1f2bbc3f7d4f367dbbee935d2939957c0ef6':
  Fix build
 2012-10-09 17:17:34 -07:00
Irfan Sheriff
17cf1f2bbc Fix build 
had local changes from b/7318044

Change-Id: Idc6907d648a07d36f93dee859e361e9655cdd8e6
 2012-10-09 17:13:37 -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
Irfan Sheriff
b182b47359 am b3b4595f: am 15253453: am 79dc154a: Merge "Disable poor network avoidance by default" into jb-mr1-dev 
* commit 'b3b4595f69dd9b109f1cfadeecc65fd752bc71e4':
  Disable poor network avoidance by default
 2012-10-09 16:38:43 -07:00
Irfan Sheriff
b3b4595f69 am 15253453: am 79dc154a: Merge "Disable poor network avoidance by default" into jb-mr1-dev 
* commit '15253453182cafc1cbd9e71240f574e127e229d6':
  Disable poor network avoidance by default
 2012-10-09 16:35:56 -07:00
Irfan Sheriff
1525345318 am 79dc154a: Merge "Disable poor network avoidance by default" into jb-mr1-dev 
* commit '79dc154afeece0db6ef602c70a34dd69bada03dc':
  Disable poor network avoidance by default
 2012-10-09 16:33:54 -07:00
Svetoslav Ganov
96985fccdc Return true on successful accessiblity action click/long click. 
1. If a view is clickable or long clickable perfroming the corresponding
   accessiblity action should return true no matter whether there is a
   registered on click/long click listener. Currently true is returned
   only if there is a listener but it is also possible that a sub-class
   overrides performClick and does work there. For example CompoundButton.
   Now if the view is clickable or long clickable we will call the
   perfrom* method and return true, which is we clicked.

2. Fixed some JavaDoc indentation.

bug:7318777

Change-Id: Id603fee378b8f7d07f1128b5641ede57640bab53
 2012-10-09 16:32:50 -07:00
Irfan Sheriff
79dc154afe Merge "Disable poor network avoidance by default" into jb-mr1-dev 2012-10-09 16:31:03 -07:00
Christopher Tate
ba09cb8c18 am 5fb80c6e: am d44525dc: am b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev 
* commit '5fb80c6ee5fa9a42bc6141383216673a7247edd8':
  Defer wifi bounce following restore for 1 minute...
 2012-10-09 16:18:15 -07:00
Christopher Tate
5fb80c6ee5 am d44525dc: am b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev 
* commit 'd44525dcd33babbb0f4e38c4a274a233283d64e0':
  Defer wifi bounce following restore for 1 minute...
 2012-10-09 16:14:33 -07:00
David Hu
2ca3ae100f Merge "Update the location tracker test app" 2012-10-09 16:14:15 -07:00
John Spurlock
fafdb6f9ca Disable Camera + Search until USER_SETUP_COMPLETE. 
Check the status of Settings.Secure.USER_SETUP_COMPLETE for the current
user when showing the keyguard, disabling the Camera + Search touchpoints
entirely until the user makes it through the setup wizard.

Bug:7308791
Change-Id: Ic8e3596582c2aefc7fe15af1824ed6bfd541dffa
 2012-10-09 19:10:33 -04:00
Christopher Tate
d44525dcd3 am b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev 
* commit 'b30a8568a8b31578b10af948869558ae218d0d5c':
  Defer wifi bounce following restore for 1 minute...
 2012-10-09 16:09:39 -07:00
Christopher Tate
cf32f96620 am fcd4db9b: am 711b4fca: am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit 'fcd4db9b8174b40a76f77bea73011c6470772465':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:07:47 -07:00
The Android Automerger
3ab07daba2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 16:07:21 -07:00
Christopher Tate
fcd4db9b81 am 711b4fca: am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit '711b4fcadda2948b73e97f4ff3dc3e96b5316499':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:05:25 -07:00
Christopher Tate
b30a8568a8 Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev 2012-10-09 16:05:04 -07:00
Christopher Tate
711b4fcadd am c9c47f82: Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 
* commit 'c9c47f821af22c6fae4c97fe185c6a651a6f9b67':
  Back up / restore the "Avoid poor connections" wifi setting
 2012-10-09 16:01:59 -07:00
Christopher Tate
c9c47f821a Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 2012-10-09 15:57:06 -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
Dirk Dougherty
8048b9ec0c am 28a40e01: am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit '28a40e01fec9e00c74e52a88a5f6fca98057af91':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-09 15:52:13 -07:00
Dirk Dougherty
28a40e01fe am aa0d43ba: Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 
* commit 'aa0d43ba2581bb97f9ee955ea185b4f2759055c6':
  Doc change: Link to AVDs docs from tablet quality checklist.
 2012-10-09 15:50:12 -07:00
Irfan Sheriff
bbe461b78f Disable poor network avoidance by default 
Bug: 7318044
Change-Id: Icf27e823453eeaba901aad6f3f8eedea242794f9
 2012-10-09 15:49:33 -07:00
Dirk Dougherty
aa0d43ba25 Merge "Doc change: Link to AVDs docs from tablet quality checklist." into jb-dev-docs 2012-10-09 15:48:34 -07:00
Dirk Dougherty
f32b582597 Doc change: Link to AVDs docs from tablet quality checklist. 
Change-Id: Ifb20a903a0dd32009b6db6e583a6d0c86cddb52e
 2012-10-09 15:43:10 -07:00
The Android Automerger
37c4565460 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 15:38:59 -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