Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,831 Commits 3 Branches 0 Tags
63ed1663dfa1efce442add8270e91bd28f14ee8a
Commit Graph

30164 Commits

Author SHA1 Message Date
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 94740e6c33

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5

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
ca4dabc360 am 8ca8e02b: am 52c59ddf: am 27258209: Merge "Return true on successful accessiblity action click/long click." into jb-mr1-dev 
* commit '8ca8e02bf207e77fcae644d8ecb30143ec098f6d':
  Return true on successful accessiblity action click/long click.
 2012-10-09 17:59: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
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
Dianne Hackborn
96a739737f am 7beb70a9: am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev 
* commit '7beb70a94af2ce29b4184fd7927bba93d90cf878':
  Fix issue #7311376: Add API to allow apps to know if they are...
 2012-10-09 17:53:13 -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
d8d279a956 am b0a23017: am f37e38a0: am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev 
* commit 'b0a230174d3c8a6d13935679ee7d2e90c0817c14':
  default the screen on during the dream.
 2012-10-09 17:44:27 -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
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
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
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
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
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
Eino-Ville Talvala
d6c0c114b9 am c2b90f77: am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit 'c2b90f77bd9c79e9437a1799140b1da215c949c6':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:28:55 -07:00
Christopher Tate
16eb7cd457 Back up / restore the "Avoid poor connections" wifi setting 
Bug 7318177

Change-Id: I8fdc037f823b8c57727e7d49c5bffdc9b3c10ebb
 2012-10-09 15:26:30 -07:00
Eino-Ville Talvala
c2b90f77bd am 685a5128: am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit '685a512868a7da11f7097282fd1a4a2af070d816':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:26:07 -07:00
Eino-Ville Talvala
685a512868 am cbdb2136: Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 
* commit 'cbdb21364653910179da1eddd43f4b932420b75b':
  Camera: Query AudioService for shutter sound enforcement.
 2012-10-09 15:23:54 -07:00
Eino-Ville Talvala
cbdb213646 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Adam Powell
68293b35dc am d338b977: am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit 'd338b9775bd549bc9d7b2153e60432ac694701fa':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:32:38 -07:00
Adam Powell
d338b9775b am db380410: am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit 'db38041002c6c9f297e8c8c1eade6471646045b2':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:29:38 -07:00
Adam Powell
db38041002 am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 
* commit '160621280d7eaba7eeddc183c4c11aa49d32e30e':
  Allow more scaling values to be tuned in resource overlays
 2012-10-09 13:27:42 -07:00
Adam Powell
160621280d Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 2012-10-09 13:25:12 -07:00
Victoria Lease
35b9ec35e7 am 45e001a3: am 45bdc2c1: am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit '45e001a3ceb456e8017784b700a645bb2efe4008':
  Multiuser love for LocationManager
 2012-10-09 12:29:46 -07:00
Victoria Lease
45e001a3ce am 45bdc2c1: am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit '45bdc2c170d37ac4821423f28cda141687256ab2':
  Multiuser love for LocationManager
 2012-10-09 12:27:08 -07:00
Victoria Lease
45bdc2c170 am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev 
* commit 'c0c0c0e612e1ccf1e55eb2a9338ddfff40d8d7f2':
  Multiuser love for LocationManager
 2012-10-09 12:24:42 -07:00
Victoria Lease
c0c0c0e612 Merge "Multiuser love for LocationManager" into jb-mr1-dev 2012-10-09 12:22:03 -07:00
Adam Powell
3307958c6b Allow more scaling values to be tuned in resource overlays 
Bug 7267507

Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
 2012-10-09 11:21:08 -07:00
Satoshi Kataoka
8fa0838bf8 Don't update the text services locale in the main thread 
Bug: 6761326
Change-Id: I9f8a81d3c9261a6cfc00292b9f5cb06053b9112d
 2012-10-09 19:20:27 +09:00
Jeff Brown
131c791954 am 33c30e36: am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '33c30e36a5f2630cf7f3b2bced899009fead3460':
  Blank or unblank all displays as need.
 2012-10-09 00:09:35 -07:00
Jeff Brown
33c30e36a5 am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
  Blank or unblank all displays as need.
 2012-10-09 00:07:05 -07:00
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
 2012-10-09 00:05:26 -07:00
Eino-Ville Talvala
4f8e5ce21d Camera: Query AudioService for shutter sound enforcement. 
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
 2012-10-08 23:53:48 -07:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need. 
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
 2012-10-08 19:23:15 -07:00
Chris Wren
a934fd142e default the screen on during the dream. 
Bug: 7295909
Change-Id: Ic629bd08bdade8dba2b92124c56cab1bb438bec2
 2012-10-08 17:23:36 -07:00
Victoria Lease
b711d57ca4 Multiuser love for LocationManager 
LocationManagerService now keeps track of the current user ID and
denies location requests made by all but the foreground user.

Additionally, location settings are now user-specific, rather than
global to the device. Location provider services now run as specific
users, and when the device's foreground user changes, we rebind to
appropriately-owned providers.

Bug: 6926385
Bug: 7247203
Change-Id: I346074959e96e52bcc77eeb188dffe322b690879
 2012-10-08 17:19:43 -07:00
Dianne Hackborn
94feaa3b3b am a4c88ee9: am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 
* commit 'a4c88ee991e452d0adbc3a5f1bcdc00a68afcc77':
  Framework side of issue #7302511: GCM client needs to use new framework API...
 2012-10-08 16:22:17 -07:00
Dianne Hackborn
a4c88ee991 am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 
* commit '1b94df8af9a6922bfba7e2ecca24bb0d7578a8e2':
  Framework side of issue #7302511: GCM client needs to use new framework API...
 2012-10-08 15:15:36 -07:00
Dianne Hackborn
1b94df8af9 am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 
* commit '4efbab480d7e1b770c5515a76b897359730c1a4d':
  Framework side of issue #7302511: GCM client needs to use new framework API...
 2012-10-08 15:05:04 -07:00
Dianne Hackborn
4efbab480d Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Selim Gurun
8d197601e7 DO NOT MERGE remove defunct javascript interface 
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Clean cherry pick of d773ca8ff2

Change-Id: I033d29718d08803f375759faf83e2058df6d4906
 2012-10-08 14:35:19 -07:00
Dianne Hackborn
36d337adff Framework side of issue #7302511: GCM client needs to use new framework API... 
...to fix background->shutdown delivery race

Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.

Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.

Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
 2012-10-08 14:33:47 -07:00
Jim Miller
5a9584321d am c88d46e9: am 6b9cd4d2: am 8215ddb4: Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev 
* commit 'c88d46e912c970e5dc24973ea519d27d5d25e2f1':
  Properly handle cancel event in GlowPadView
 2012-10-08 13:46:33 -07:00
Jim Miller
c88d46e912 am 6b9cd4d2: am 8215ddb4: Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev 
* commit '6b9cd4d2563b824208050cdc28c5de2447e5c4e4':
  Properly handle cancel event in GlowPadView
 2012-10-08 13:43:53 -07:00