Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,168 Commits 3 Branches 0 Tags
e8f2334e7e8266b21746cd85dac2ff14c6d9efe2
Commit Graph

27019 Commits

Author SHA1 Message Date
Christopher Tate
e8f2334e7e am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev 
* commit 'e1f02ef080e5046e03b4b3b7bb64e22e7790b707':
  Miscellaneous fixes for Settings
 2012-09-10 19:23:25 -07:00
Christopher Tate
e1f02ef080 Merge "Miscellaneous fixes for Settings" into jb-mr1-dev 2012-09-10 19:21:53 -07:00
Selim Gurun
f0aa7ea686 am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev 
* commit 'befab9e6b8fcb69cc656bb851ddc7ad7dfa6a7db':
  Control access to inherited methods of jsinterface objects
 2012-09-10 18:18:47 -07:00
Christopher Tate
d5fe147924 Miscellaneous fixes for Settings 
(1) It's okay to write literal null as a settings element value
(2) Properly convey the user handle in the put-for-user variant

Bug 7137201
Bug 7139826

Change-Id: I0ed77d65e8377f0e0580a2668f10b7167ad34928
 2012-09-10 17:32:39 -07:00
Selim Gurun
94740e6c33 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.

Change-Id: I41927248e6bc4b09d17c0707c60fe5e6ab681e66
 2012-09-10 16:43:35 -07:00
John Reck
20f26418f7 am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev 
* commit 'bdf8fa0c1b762d82b056fa8d929ceaff47ae241b':
  Fix some destroy bugs
 2012-09-10 16:33:17 -07:00
John Reck
bdf8fa0c1b Merge "Fix some destroy bugs" into jb-mr1-dev 2012-09-10 16:30:19 -07:00
Katie McCormick
54f6784794 am a25526ae: am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit 'a25526ae400641ae414d2dbf03495f54a0c46d2d':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 16:29:51 -07:00
Katie McCormick
a25526ae40 am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '51740d6d786bf583cd46d12beb8515aa00d84bee':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 16:27:20 -07:00
Katie McCormick
51740d6d78 am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '0e9f34bffdfc476122337d077453f722fc22038f':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 16:25:17 -07:00
Katie McCormick
0e9f34bffd Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
 2012-09-10 16:20:20 -07:00
John Reck
095e8aa02b Fix some destroy bugs 
Bug: 6961494
 Don't call clearHelpers in destroy(). It is already called
 in onDetach, which is where it needs to be. It can't be
 called by the finalizer

 Switch onCancel listener to onDismiss listener. Fixes an issue
 where destroying can live the webcore thread hung because onCancel
 won't be called, but onDismiss is

Change-Id: I669c389c8c9a81d92c27f88d83bcb711c6c0a5ee
 2012-09-10 16:07:04 -07:00
Siva Velusamy
0dffc8d5d0 am bc91c5f8: Merge "Report the user id of every app to ddms." into jb-mr1-dev 
* commit 'bc91c5f8b175c20f7e63ee245bd70c7e7bba2ba5':
  Report the user id of every app to ddms.
 2012-09-10 16:02:28 -07:00
Siva Velusamy
bc91c5f8b1 Merge "Report the user id of every app to ddms." into jb-mr1-dev 2012-09-10 15:59:36 -07:00
Dianne Hackborn
68e18e5558 am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev 
* commit '009ea5a04c38dd209b73d28cb867f05e63ec89cc':
  USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
 2012-09-10 15:51:26 -07:00
Dianne Hackborn
009ea5a04c Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev 2012-09-10 15:49:59 -07:00
Dianne Hackborn
a5ba6b33ba am 4573e29f: Merge "Flesh out multi-user in am commands." into jb-mr1-dev 
* commit '4573e29faf40983f9d1df99bb0f506d77a868e05':
  Flesh out multi-user in am commands.
 2012-09-10 15:40:36 -07:00
Dianne Hackborn
4573e29faf Merge "Flesh out multi-user in am commands." into jb-mr1-dev 2012-09-10 15:39:02 -07:00
Dianne Hackborn
8a9f5d42a5 USER_CURRENT_OR_SELF had the same int as USER_CURRENT! 
Change-Id: I0f2b0fa4fb82d1f871450b509a7a4d13e9817320
 2012-09-10 15:37:53 -07:00
Dianne Hackborn
1676c856d6 Flesh out multi-user in am commands. 
Now we default to the current user instead of user 0 for most commands
(except where we can do the command for all users).

Many more commands take a user argument: force-stop, kill, profile,
dumpheap.

Improved help text.

Change-Id: I719a13b4d31b668f57ca21e51d7043ac3e0d4e1b
 2012-09-10 14:52:30 -07:00
Siva Velusamy
d693dfa75b Report the user id of every app to ddms. 
This CL extends the HELO and APNM packets to include the user id
of the application. This allows ddms users to differentiate between
the same app running for multiple users.

Bug 7110696.

Change-Id: I490d0e3781b8fb9db65cf81188677a0955650511
 2012-09-10 14:44:38 -07:00
Victoria Lease
73b21be0e4 am d7f5a51b: Merge "IME support for trackball and generic motion events" into jb-mr1-dev 
* commit 'd7f5a51baf2c46436dc5bac3807fb0d46cbff304':
  IME support for trackball and generic motion events
 2012-09-10 14:16:20 -07:00
Victoria Lease
d7f5a51baf Merge "IME support for trackball and generic motion events" into jb-mr1-dev 2012-09-10 14:12:48 -07:00
Victoria Lease
b38070caa5 IME support for trackball and generic motion events 
Trackball and generic motion events now pass through the IME in case
it would like to handle them before passing them on to the view
hierarchy.

While I was at it, I also...
...fixed the documentation on InputMethodService.onKeyUp()
...added documentation to InputMethodService.onTrackballEvent()
...added trackball and generic motion events to the "input" command
...fixed input consistency verification involving ACTION_OUTSIDE

Bug: 7050005
Change-Id: I40ab68df4a9542af6df25de6ec2ec500e4c02902
 2012-09-10 14:01:42 -07:00
Chet Haase
efba28f928 am e11dc0dd: Merge "Fix clone() for Animators with just a \'to\' value" into jb-mr1-dev 
* commit 'e11dc0ddab438d3b6545bc5d1582e1deddb5d465':
  Fix clone() for Animators with just a 'to' value
 2012-09-10 13:59:33 -07:00
Chet Haase
e11dc0ddab Merge "Fix clone() for Animators with just a 'to' value" into jb-mr1-dev 2012-09-10 13:56:47 -07:00
Chet Haase
00177e483d Fix clone() for Animators with just a 'to' value 
Previously, clone() on an Animator with only one value would mistakenly
think that the clone had a real starting value (which would end up being 0 in the
int and float cases). Fix is to set the 'mHasFirstValue' flag appropriately for the
clone, based on the state of the cloned animator.

Issue #7106442 ObjectAnimator.clone() does not work properly for single parameter

Change-Id: I08bf03b7687a65eb613c1671a58e4cbfae66a30e
 2012-09-10 13:42:07 -07:00
Svetoslav Ganov
d17937491c am 1434e29a: Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev 
* commit '1434e29ac6a157130c9882606ca577567c91ddc4':
  Check for null ViewRootImpl when saving accessibility focus in ListView.
 2012-09-10 11:33:48 -07:00
alanv
27093def8d Check for null ViewRootImpl when saving accessibility focus in ListView. 
Bug: 7135071
Change-Id: Ide8b6af38b7f1b9bb809e4f8b1c933cb5ddb5e86
 2012-09-10 11:10:25 -07:00
Wu-cheng Li
ed0878bfef am 753e1280: Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 
* commit '753e1280cbc3f0006b04f67385f02e1f92019f7d':
  Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
 2012-09-10 00:50:50 -07:00
Wu-cheng Li
753e1280cb Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 2012-09-10 00:48:26 -07:00
Dianne Hackborn
592877daab am 8727a731: Merge "A little cleanup." into jb-mr1-dev 
* commit '8727a73127dde026a797511d28355868797f0e46':
  A little cleanup.
 2012-09-09 14:49:11 -07:00
Dianne Hackborn
1b8ecc5031 A little cleanup. 
Change-Id: Ie33fd1b02011606e67ce08df3cce887c07680c60
 2012-09-09 14:41:34 -07:00
Jeff Brown
1c897dc9ac am a3909a93: Work around crash when display is removed. 
* commit 'a3909a93958676d341424d574752bc7b3280d421':
  Work around crash when display is removed.
 2012-09-09 01:15:56 -07:00
Jeff Brown
a3909a9395 Work around crash when display is removed. 
After a display is removed, there may be a brief time
when a Context still exists that is bound to it.
We need to provide metrics in this case.

Bug: 7131637
Change-Id: I11b264a000653adbf0f3da399eaab66c4b40fb2a
 2012-09-09 01:05:38 -07:00
Jeff Brown
2ff27aae3b am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev 
* commit '20ec8ac58665e6e2991988c134ba3b8590911648':
  Improve Wifi display discovery API.
 2012-09-09 00:26:09 -07:00
Jeff Brown
20ec8ac586 Merge "Improve Wifi display discovery API." into jb-mr1-dev 2012-09-09 00:23:59 -07:00
Jeff Brown
180bbc7181 Improve Wifi display discovery API. 
Change-Id: I4d46503e5413f52da16f79bbc9c631cc5ae9c178
 2012-09-08 23:15:00 -07:00
Amith Yamasani
c143c25e58 am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev 
* commit '8f008e737a84be289d07cc603f98da1bbbfcf837':
  More multi-user methods in PM
 2012-09-08 20:24:11 -07:00
Amith Yamasani
8f008e737a Merge "More multi-user methods in PM" into jb-mr1-dev 2012-09-08 20:20:57 -07:00
Amith Yamasani
151ec4c9f8 More multi-user methods in PM 
pm can list installed packages by user now.

Bug: 6926465

Change-Id: I822311bfd6e7e2d6fb315fc484739fbf953c9bb6
 2012-09-08 19:14:00 -07:00
Jeff Brown
a24b598b28 am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 
* commit '1edf63ef4c7484355a6d9371bea912d6518a7d1e':
  Enable auto-brightness adjustment feature with system prop.
 2012-09-08 15:56:37 -07:00
Jeff Brown
1edf63ef4c Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 2012-09-08 15:53:50 -07:00
Jeff Brown
631938f26d Enable auto-brightness adjustment feature with system prop. 
This feature is experimental and disabled by default.

Change-Id: I183534370da7613557e4d1535f556873f8a763df
 2012-09-08 15:11:11 -07:00
Jeff Brown
34cf966057 am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev 
* commit 'b0d10aa9831fb74a28db63cac9d111559bed62ab':
  Add new wifi display discovery API.
 2012-09-08 14:57:55 -07:00
Jeff Brown
b0d10aa983 Merge "Add new wifi display discovery API." into jb-mr1-dev 2012-09-08 14:55:02 -07:00
Jeff Brown
e08ae388d6 Add new wifi display discovery API. 
The API is quite simple.  There are a few extra functions
on DisplayManager to scan, connect and disconnect from
wifi displays and get status, and a single protected
broadcast sent when the status changes.

Change-Id: Ic91dbab5ee818e790b27fa32e1a1e93788793be0
 2012-09-08 14:53:34 -07:00
Dianne Hackborn
25653cbca5 am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 
* commit '5d75052b2da7ed7c153faea69a28f13a4000788f':
  Add Binder.getCallingUserHandle().
 2012-09-07 18:37:29 -07:00
Dianne Hackborn
74ee8652e0 Add Binder.getCallingUserHandle(). 
Change-Id: I2a7eedfdc7baeeb4c2cd2ca0153aa95e0cf0bf45
 2012-09-07 18:33:18 -07:00
Jeff Brown
5ea4944a20 am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev 
* commit '7017e48380ab0c1be033594bb2a9331898ad5be8':
  Add support for Wifi display.
 2012-09-07 16:44:32 -07:00