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

84050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
ddcca31997 Remove obsolete variables. 
Bug: 6987838
Now emma is only enabled for apks.

Change-Id: Id8d198467076a8dff705195a8e051f3fb00d5660
 2012-08-21 17:24:03 -07:00
Jason Sams
d9cde0435d am f9678070: Merge "Fix bug in grain." into jb-mr1-dev 
* commit 'f9678070a03ad16d223d26a38b319d38d5943a71':
  Fix bug in grain.
 2012-08-21 17:13:06 -07:00
Jason Sams
6afc755bf0 am a8309cb7: Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev 
* commit 'a8309cb7ee05502176c2715f381ea5e63016daae':
  Move the kernel launch to specific intrinsic class.
 2012-08-21 17:11:24 -07:00
Brian Muramatsu
07d9f60b15 am 43c7aae4: Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev 
* commit '43c7aae4d0cf9e2d3527b093022ae1fa70d3920f':
  Listen for CONNECTIVITY_ACTION in GPS Provider
 2012-08-21 17:11:20 -07:00
Jason Sams
f9678070a0 Merge "Fix bug in grain." into jb-mr1-dev 2012-08-21 17:09:56 -07:00
Jason Sams
a8309cb7ee Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev 2012-08-21 17:08:17 -07:00
Brian Muramatsu
43c7aae4d0 Merge "Listen for CONNECTIVITY_ACTION in GPS Provider" into jb-mr1-dev 2012-08-21 17:08:17 -07:00
John Grossman
b6a9ebc9c7 am df441848: Merge "common_time: Move default election config to bcast." into jb-mr1-dev 
* commit 'df441848164a4cded48595abf64f379c31e026f5':
  common_time: Move default election config to bcast.
 2012-08-21 16:57:21 -07:00
John Grossman
df44184816 Merge "common_time: Move default election config to bcast." into jb-mr1-dev 2012-08-21 16:54:36 -07:00
John Grossman
7a947c4978 common_time: Move default election config to bcast. 
Change the default master election and arbiration to use broadcast
instead of multicast.  As nice as the idea of using multicast for
discovery is, in the end it had just proven to be too unreliable in
random people's home infrastructures as well as the more complicated
managed infrastructures we are using internally.  Multicast still
works, and the service can still be configured to use it, but for now
we are switching to broadcast.

Also, add runtime checks to filter out our own broadcast traffic as
there does not seem to be any good sockopt in linux to do this for us
(there is one for multicast, but not broadcast).

Change-Id: I8ada3541cceca2e76c7a0c1a624a72026122c312
 2012-08-21 16:39:11 -07:00
Nick Pelly
8c37dc72c4 am 4a81ef8f: Merge "Fix some location issues exposed by CTS." into jb-mr1-dev 
* commit '4a81ef8fd3207b06a65709338470d1e6ebed8620':
  Fix some location issues exposed by CTS.
 2012-08-21 16:32:31 -07:00
Brian Muramatsu
b94b41f516 Listen for CONNECTIVITY_ACTION in GPS Provider 
Bug: 7020678

The broadcast receiver in GpsLocationProvider now listens for
CONNECTIVITY_ACTION changes. Set the intent filter so that
it catches those actions and updates the network state.

Change-Id: I7efd393dfe2aa8b172dd6701d42ff9ed687648a2
 2012-08-21 16:30:57 -07:00
Nick Pelly
4a81ef8fd3 Merge "Fix some location issues exposed by CTS." into jb-mr1-dev 2012-08-21 16:29:54 -07:00
Nick Pelly
1332b53522 Fix some location issues exposed by CTS. 
Change-Id: I5859ee2c9db5745b0a3bc8abfa8f08728fb25059
 2012-08-21 16:26:26 -07:00
Selim Gurun
e62bf6b7e4 am a6d16993: Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev 
* commit 'a6d16993eb6b8834095b8e308523b2d28259e430':
  Small tidy up to getDefaultUserAgent. DO NOT MERGE
 2012-08-21 16:15:23 -07:00
Selim Gurun
a6d16993eb Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:12:56 -07:00
Selim Gurun
0cf5fdb57d am b62999c1: Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev 
* commit 'b62999c136802f5ab0b95308b3751702d72afcb8':
  Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE
 2012-08-21 16:08:34 -07:00
Jonathan Dixon
951fcabef6 Small tidy up to getDefaultUserAgent. DO NOT MERGE 
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117

Clean cherry pick: d1c4faa5a4c2be71d529d35572c5f807beee7ddc

Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
 2012-08-21 16:08:22 -07:00
Selim Gurun
b62999c136 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:06:04 -07:00
Stephen Hines
c744c14ae7 am cdb05977: Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev 
* commit 'cdb05977acede73c1362e8365a196839078fc896':
  Switch to v8 (and appropriate llvm-rs-cc stuff).
 2012-08-21 16:04:37 -07:00
Stephen Hines
cdb05977ac Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev 2012-08-21 16:01:30 -07:00
Jason Sams
f1c051b6f2 Fix bug in grain. 
Compare with 0 was done against unsigned which did not
correctly clamp.

Change-Id: I6dbff36190c279961017e57db3aaba51c60a0ad3
 2012-08-21 15:54:07 -07:00
Jason Sams
19e1086df1 Move the kernel launch to specific intrinsic class. 
This allows support of both input types. Kernel source
and global source.

Change-Id: Iea60bebd79c786795eae81c14cbec352b470a9c0
 2012-08-21 15:53:29 -07:00
Mikhail Naganov
9d5e7aa38d Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE 
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.

Clean cherry pick: 1202d66f78fb24850b997e37f0ce3cb3b36e4bbf

Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe
 2012-08-21 15:52:40 -07:00
Dianne Hackborn
37674ee787 am b4f56b5e: am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit 'b4f56b5ea23325a492b61989a94a738be0fe9b8b':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:45:32 -07:00
Dianne Hackborn
b4f56b5ea2 am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit '8b97ee6d8c26974a6fc9ce85c3d7a07ca1e9cac2':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:42:42 -07:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:39:42 -07:00
Craig Mautner
66c6117538 am 7e877fa0: Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev 
* commit '7e877fa00c6b093a0fe734e5d3bf23b5b2d6411e':
  Fix to allow SYSTEM_UID to display windows.
 2012-08-21 15:33:41 -07:00
Craig Mautner
7e877fa00c Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev 2012-08-21 15:30:42 -07:00
Craig Mautner
a2d7b1117a Fix to allow SYSTEM_UID to display windows. 
Was not previously checking to make sure that the appId was not
SYSTEM_UID (1000). This caused certain system windows to fail to
appear.

Change-Id: I939dc2f8a256acb84b7c413c7e00003a89aff6d4
 2012-08-21 15:24:54 -07:00
Justin Ho
72404a82d3 Merge "Update Back softkey icon Bug: 6020915" into jb-dev 2012-08-21 15:19:15 -07:00
Dianne Hackborn
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -07:00
Craig Mautner
b9bccdbbbc am de1d96c7: Merge "Hide non user app windows from other users." into jb-mr1-dev 
* commit 'de1d96c736730c2a99a225311b9211a34042f9d4':
  Hide non user app windows from other users.
 2012-08-21 14:29:07 -07:00
Craig Mautner
de1d96c736 Merge "Hide non user app windows from other users." into jb-mr1-dev 2012-08-21 14:26:28 -07:00
Amith Yamasani
d20c101610 am 23e28255: Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev 
* commit '23e282554ee0ddff80fd5bd2f47d5fb37b3b02c5':
  Multiprocess activity should be allowed to run on current user
 2012-08-21 14:22:14 -07:00
Justin Ho
962daf9b1c Update Back softkey icon 
Bug: 6020915

Change-Id: I780f09bd1e99a10b2189ab253dd1a082118a385d
 2012-08-21 14:21:29 -07:00
Teng-Hui Zhu
861f91d6f0 am 2253eeab: Add context support into the filter framework. 
* commit '2253eeab6c0c20e0b03f144c5bc23ae13e8ab234':
  Add context support into the filter framework.
 2012-08-21 14:20:35 -07:00
Amith Yamasani
23e282554e Merge "Multiprocess activity should be allowed to run on current user" into jb-mr1-dev 2012-08-21 14:19:51 -07:00
Teng-Hui Zhu
2253eeab6c Add context support into the filter framework. 
Basically we need the context to pass the content URI into MediaPlayer.
bug:6837809

Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
 2012-08-21 14:17:02 -07:00
Jean-Baptiste Queru
8fe96f4766 am 02df84a3: am 34d85746: am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 
* commit '02df84a3b1b4f68044d981bb345515ae9419d0c1':
  Tests/RS: Add RS context check for RsBalls setAccel()
 2012-08-21 14:03:34 -07:00
Jean-Baptiste Queru
02df84a3b1 am 34d85746: am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 
* commit '34d8574665caaef52f7c595b57f45f1c9efd7e39':
  Tests/RS: Add RS context check for RsBalls setAccel()
 2012-08-21 14:02:02 -07:00
Jean-Baptiste Queru
34d8574665 am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 
* commit 'b8da225f26b689288710ff0eafefa906b4f5700f':
  Tests/RS: Add RS context check for RsBalls setAccel()
 2012-08-21 14:00:11 -07:00
Nick Pelly
4002b8a177 am 257662ef: Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev 
* commit '257662efe2a5edd13601b4372b5c1ff0431ddda9':
  Print timestamp (instead of age) in Location#toString()
 2012-08-21 13:55:23 -07:00
Nick Pelly
257662efe2 Merge "Print timestamp (instead of age) in Location#toString()" into jb-mr1-dev 2012-08-21 13:53:04 -07:00
Nick Pelly
5584b497b7 Print timestamp (instead of age) in Location#toString() 
Age was a bad idea, since it depends when toString() was called

Change-Id: Ica0b6bfa9a93b5a452ba3def5fbb2b0a0194c401
 2012-08-21 13:52:20 -07:00
Scott Anderson
a457531b12 am ccc7b98e: Merge "BatteryService: Fix comment to match code" into jb-mr1-dev 
* commit 'ccc7b98eaf6b7067d3585661e690121fa1430feb':
  BatteryService: Fix comment to match code
 2012-08-21 13:37:11 -07:00
Scott Anderson
ccc7b98eaf Merge "BatteryService: Fix comment to match code" into jb-mr1-dev 2012-08-21 13:34:48 -07:00
Jim Miller
652520aed5 am f6449761: Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev 
* commit 'f644976101e45a7801b58cea1d86f5e1744046ec':
  Update AppWidgetHost with better support for OnClickHandlers
 2012-08-21 13:22:02 -07:00
Jim Miller
f644976101 Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev 2012-08-21 13:19:31 -07:00
Scott Anderson
5ad9fc2182 BatteryService: Fix comment to match code 
Change-Id: Ib4e30e7808ff3a2a8a49c000eac719a3a4273fdd
Signed-off-by: Scott Anderson <saa@android.com>
 2012-08-21 13:11:26 -07:00