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

89471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yu Shan Emily Lau
2ffd20753e Instead of collecting the procmem output in 
the test, change it as optional. This is to avoid
the tool breakage will block the whole memory test sutie.

Change-Id: Ia7425531ca2151230d7fd98eb710f282e166b4f7
 2012-10-09 19:12:46 -07:00
Dianne Hackborn
36db9d0879 Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev 2012-10-09 19:10:49 -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
Selim Gurun
534a67c557 DO NOT MERGE Control access to inherited methods of jsinterface objects 
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Clean cherry pick of 94740e6c333a109be7516abbd17dd418f23b4f0c

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5bce9965c1539c3c8611614424a5aff

Add a glue logic to require use of annotations in injected accessibility
 objects.

Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
 2012-10-09 18:42:15 -07:00
Svetoslav Ganov
b096f6f5d0 am 24169a6b: am 64182d84: Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev 
* commit '24169a6beb6726d34c83521f8c0467b4dbafb0de':
  Properly label RecentsActivity for accessibility. Bug: 7229886
 2012-10-09 18:38:27 -07:00
Svetoslav Ganov
24169a6beb am 64182d84: Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev 
* commit '64182d8444e5f6c9bdc25d4a7e53fd8439e2303b':
  Properly label RecentsActivity for accessibility. Bug: 7229886
 2012-10-09 18:36:28 -07:00
Svetoslav Ganov
64182d8444 Merge "Properly label RecentsActivity for accessibility. Bug: 7229886" into jb-mr1-dev 2012-10-09 18:33:31 -07:00
Baligh Uddin
54f0cb4846 am 3decc4b5: am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 
* commit '3decc4b59764c4fbd0b8630606dae325c414bf3a':
  Revert "Add config resource to help ATT prepaid"
 2012-10-09 18:00:26 -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
Svetoslav Ganov
8ca8e02bf2 am 52c59ddf: am 27258209: Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 
* commit '52c59ddfee480fe974194af6a6abe7fbd19aba9d':
  Return true on successful accessiblity action click/long click.
 2012-10-09 17:57:06 -07:00
Baligh Uddin
3decc4b597 am 2aee7c18: Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 
* commit '2aee7c1843670f5b7a81261079ad0eb1e4ebb9ef':
  Revert "Add config resource to help ATT prepaid"
 2012-10-09 17:56:45 -07:00
Svetoslav Ganov
52c59ddfee am 27258209: Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 
* commit '27258209fee11a45154875c3c5493962f55904d2':
  Return true on successful accessiblity action click/long click.
 2012-10-09 17:54:58 -07:00
Baligh Uddin
2aee7c1843 Merge "Revert "Add config resource to help ATT prepaid"" into jb-mr1-dev 2012-10-09 17:53:37 -07:00
Casey Burkhardt
d7059dfb9b Properly label RecentsActivity for accessibility. 
Bug: 7229886

Change-Id: I440c7e9b9ef3272e287d5d4d58bcfc0e8d0735ac
 2012-10-09 17:53:21 -07:00
Baligh Uddin
2133caf515 Revert "Add config resource to help ATT prepaid" 
breaking jb-mr1-release

This reverts commit 901ac560cafe0b8d76fd7441cbaf8749be33577c

Change-Id: I5fab4097a40e0ba31dc716967ef921c113a795a7
 2012-10-09 17:52:52 -07:00
Svetoslav Ganov
27258209fe Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 2012-10-09 17:52:01 -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
Chris Wren
b0a230174d am f37e38a0: am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev 
* commit 'f37e38a0b3284aaa27a153a3c017a60be1018e3e':
  default the screen on during the dream.
 2012-10-09 17:42:28 -07:00
Chris Wren
f37e38a0b3 am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev 
* commit 'f966cf353942690ca691e52a5b396a824fd52829':
  default the screen on during the dream.
 2012-10-09 17:41:05 -07:00
Chris Wren
f966cf3539 Merge "default the screen on during the dream." into jb-mr1-dev 2012-10-09 17:38:30 -07:00
Dirk Dougherty
0c9c8d0a06 am 137b8f4c: am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit '137b8f4c0e8fdc354432231362a0bfbcf11ed96e':
  Doc change: edits to TV tablet story.
 2012-10-09 17:36:26 -07:00
Dirk Dougherty
137b8f4c0e am f761a9a6: Merge "Doc change: edits to TV tablet story." into jb-dev-docs 
* commit 'f761a9a634a43662525d9c0c537ac5499263fd81':
  Doc change: edits to TV tablet story.
 2012-10-09 17:33:52 -07:00
Winson Chung
7a6355b679 Fixing issue where Quick Settings user profile was not showing name or default picture. (Bug 7308719) 
Change-Id: Idbaf377d1cd086cf5d8244d6c7ca084145ccf217
 2012-10-09 17:33:16 -07:00
Dirk Dougherty
f761a9a634 Merge "Doc change: edits to TV tablet story." into jb-dev-docs 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
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
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
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
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
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