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

106325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable" 
* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable
 2013-07-16 17:06:36 -07:00
Adam Powell
30ad720304 Merge "Consider mScrollX when drawing the checkMarkDrawable" 2013-07-17 00:04:28 +00:00
Jeff Brown
ba8a54136d Fix missing lock in power manager. 
The display wake lock and other internal state could become
out of sync if we happened to execute the power manager's update
function concurrently due to the missing lock.

This bug can be trigged due to display state changes or proximity
sensor updated.  Although it would be extremely rare, we have
some evidence of this happening on at least a few devices resulting
in rapid power drain with the screen off or a crash.

Bug: 9880044
Change-Id: I3c674ce429621a50cbb36c3a01883d5f388205b2
(cherry picked from commit d91e417b06388694db213257b4df6b4dd78e0d49)
 2013-07-16 22:29:57 +00:00
Roman Nurik
5c38799b54 Add Flo to device art generator. 
Change-Id: I69e5d3ff3685c250d3c44bc616aec515ebc4835e
 2013-07-16 14:32:12 -07:00
Craig Mautner
7c6be10d31 Remove iterators (DO NOT MERGE) 
Remove DisplayContentsIterator and AllWindowsIterator. These were cute
but they take up valuable resources. Iterate over ArrayList members
in their place.

Change-Id: Ie0c537608532cfb36f34d976cc6eacd21bad98cd
 2013-07-16 13:07:48 -07:00
The Android Open Source Project
59734490f6 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
 2013-07-15 09:32:49 -07:00
The Android Automerger
d67c55b8d0 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:11 -07:00
Deepanshu Gupta
d97d60c0fa Add orientation to configuration for layoutlib. 
Update the configuration with the device orientation before rendering.

Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
 2013-07-12 15:54:08 -07:00
Adam Powell
45130c62e1 am 1dc3b790: am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed" 
* commit '1dc3b790df61aa95cb68da390045249c59049fcd':
  PreferenceActivity should not leave message in looper when destroyed
 2013-07-12 15:11:41 -07:00
Adam Powell
1dc3b790df am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed" 
* commit '4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
  PreferenceActivity should not leave message in looper when destroyed
 2013-07-12 15:09:54 -07:00
Adam Powell
4b8cc94cc6 Merge "PreferenceActivity should not leave message in looper when destroyed" 2013-07-12 22:07:04 +00:00
Scott Main
e86ba6dcbe am 797a99ff: am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit '797a99ff3e7e1fd81f8def2e5ca4ea089c01ad06':
  add warning for Windows users and fix typos
 2013-07-12 14:28:40 -07:00
Scott Main
797a99ff3e am c0f5bb70: am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit 'c0f5bb70b72c25c0057d2318bbcc8d79553d1e12':
  add warning for Windows users and fix typos
 2013-07-12 14:22:48 -07:00
Scott Main
c0f5bb70b7 am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos
 2013-07-12 14:20:11 -07:00
Scott Main
ca4b112eb2 am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit '546ac85a834cf033cf1f3ce82624f1f4a63d099f':
  add warning for Windows users and fix typos
 2013-07-12 14:17:30 -07:00
Scott Main
546ac85a83 am ad17523d: add warning for Windows users and fix typos 
* commit 'ad17523da976c2d6b7b70fd3aa9ad290e4731224':
  add warning for Windows users and fix typos
 2013-07-12 14:15:15 -07:00
Scott Main
ad17523da9 add warning for Windows users and fix typos 
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
 2013-07-12 14:09:38 -07:00
Wink Saville
97b077bc18 am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:03:53 -07:00
Wink Saville
42a85412d1 am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '925ec03fcd9651ff4c6b04982eb6d930b16493b9':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:01:41 -07:00
Wink Saville
925ec03fcd Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:59:03 +00:00
Amith Yamasani
8361a9f719 am 1a1a7c08: am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 
* commit '1a1a7c0878320b94d01da6bdfaa857c85b4199a3':
  Pass along the user id to AttributeCache requests
 2013-07-12 11:21:27 -07:00
Amith Yamasani
1a1a7c0878 am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 
* commit '06a441de3b6756cf49879ff445ac26c66da54d02':
  Pass along the user id to AttributeCache requests
 2013-07-12 11:19:24 -07:00
Amith Yamasani
06a441de3b Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev 2013-07-12 18:17:09 +00:00
The Android Open Source Project
a4ee3088e7 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f
 2013-07-12 07:27:43 -07:00
Hiroaki Kuriyama
1ebf13ef20 PreferenceActivity should not leave message in looper when destroyed 
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())

Two cases have been found to observe this issue.
[Case 1]
 1,Launch IME in advance.
 2,Go to Settings >Apps > All and choose the IME package.
 3,Click "Clear data"
 4,Application crash occurs on com.android.settings.
[Case 2]
 1,Go to Settings > Language&input > Language.
 2,ListView dialog to choose language is shown.
 3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
 4,Application crash occurs on com.android.settings.

Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
 2013-07-12 15:42:35 +09:00
Elliott Hughes
9c8685b714 am f094eefc: am c5de9c35: Merge "Track libcore API update." 
* commit 'f094eefc34013c7167effa558b488709eaa54751':
  Track libcore API update.
 2013-07-11 18:55:54 -07:00
Elliott Hughes
f094eefc34 am c5de9c35: Merge "Track libcore API update." 
* commit 'c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
  Track libcore API update.
 2013-07-11 18:52:11 -07:00
Scott Main
a1063aa3fb am a60edcbe: am c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'a60edcbee7d99058eb689761097826adac0593e7':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:14:52 -07:00
Scott Main
a60edcbee7 am c079e43f: am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'c079e43fc317087ae5517ee7d9a376e97fef0f57':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:12:01 -07:00
Scott Main
c079e43fc3 am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'e920ab1a82327976e0a25842d7d57dc7a92ba604':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:09:53 -07:00
Dirk Dougherty
8b1cdd9874 am e34e6520: am e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'e34e65203f8188849cfebb901c4efe5b5b4ad8d5':
  Doc change: Update gcore reference docs.
 2013-07-11 18:08:36 -07:00
Scott Main
e920ab1a82 am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'a618e93891603f825fd2c0ec1a67c96c29863dcd':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:08:01 -07:00
Dirk Dougherty
e34e65203f am e4709679: am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'e4709679198590fa37fbad67df0d7e3827c4f8cf':
  Doc change: Update gcore reference docs.
 2013-07-11 18:06:22 -07:00
Scott Main
a618e93891 am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'c660c608e75791d5b4b286f34a9ec335f9e95ba6':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:05:44 -07:00
Scott Main
c660c608e7 Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 2013-07-12 01:03:22 +00:00
Dirk Dougherty
e470967919 am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'c1addd4750be5b1721a8668a110e74fa59e476c6':
  Doc change: Update gcore reference docs.
 2013-07-11 18:03:17 -07:00
Dirk Dougherty
c1addd4750 am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'c7da42d76470c4e9fb541058e942e31163275b83':
  Doc change: Update gcore reference docs.
 2013-07-11 18:01:26 -07:00
Dirk Dougherty
c7da42d764 am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'f7832a35f3961e1b6665b5428899cdad598f0544':
  Doc change: Update gcore reference docs.
 2013-07-11 17:59:22 -07:00
Dirk Dougherty
f7832a35f3 am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'd6bbda24150eddc59865133377f6b41c8a1ed3b5':
  Doc change: Update gcore reference docs.
 2013-07-11 17:56:35 -07:00
Dirk Dougherty
d6bbda2415 am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'bc5f9b66744b76c676543902d31d324f2dd02d09':
  Doc change: Update gcore reference docs.
 2013-07-11 17:54:00 -07:00
Dirk Dougherty
bc5f9b6674 Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 2013-07-12 00:50:59 +00:00
Scott Main
717fb2b60d am 334f6ea6: am 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '334f6ea68945dd642e6a924bf399d2afd21bf107':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:46:29 -07:00
Scott Main
334f6ea689 am 24810c6f: am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '24810c6f5854e595b2c78f9c3e44b7d4045a7472':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:44:09 -07:00
Scott Main
24810c6f58 am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '3c13e5284e83390301bf3306e5d77f7014483ea0':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:41:48 -07:00
Scott Main
3c13e5284e am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '536fa1bbe10b793e7c5d585c974693349fb8a4f5':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:38:31 -07:00
Scott Main
536fa1bbe1 am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '84ad0894be13b374b9b75e204dabea6a1579e131':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:36:53 -07:00
Scott Main
84ad0894be fix markup error in download button and fix transition to install/update guide 
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
 2013-07-11 17:33:55 -07:00
Jeff Sharkey
2248ff32ba Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 17:22:41 -07:00
Robert Greenwalt
6f2b31fcf5 am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '56a7e4ad43eb5288a80b34566db365aaaa845e87':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:09:14 -07:00
Robert Greenwalt
56a7e4ad43 am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '116d46659889f588fa9ffa5e1bc4dda90067fce6':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:07:06 -07:00