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

5925 Commits

Author SHA1 Message Date
satok
42c5a1666c Fix internal variables and equals in SuggestionSpan 
Bug: 4443922

- Instantiating other package's class for the name is complicated, so we changed the internal value for the notification target class from Class to String.
- Implement equals

Change-Id: Iaf7682be777f0027d33c9a3be4609ac01b6950ad
 2011-05-26 19:21:35 +09:00
Joe Onorato
2a3c67c0e9 am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
  Make adb shell am display-size persistent.
 2011-05-25 21:29:07 -07:00
Dianne Hackborn
620d69d85b am 103e74d9: am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit '103e74d9b1fdebbbc035da0567cd075554d4137d':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 21:28:39 -07:00
satok
f9f0100862 Add Apis to send notifications when the suggestion was picked 
- Due to a strong request from VoiceIME

Bug: 4443922

Change-Id: Ia539de0acf66053e0349daec459d75e36805f6bf
 2011-05-26 11:02:31 +09:00
Joe Onorato
cfb046dead am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
  Make adb shell am display-size persistent.
 2011-05-25 11:46:28 -07:00
Joe Onorato
2c09a9c0e9 am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
  Make adb shell am display-size persistent.
 2011-05-25 11:43:06 -07:00
Joe Onorato
5520610cb2 Merge "Make adb shell am display-size persistent." into honeycomb-mr2 2011-05-25 11:40:59 -07:00
Joe Onorato
571ae90801 Make adb shell am display-size persistent. 
Change-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9
 2011-05-25 11:40:21 -07:00
Dianne Hackborn
103e74d9b1 am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit 'd6f29cd8f92b098330818227428f5a42836097b7':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 11:18:59 -07:00
Dianne Hackborn
d6f29cd8f9 am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit '2a15eb559cfc18800b3e345995df76695a3ae4b2':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 11:14:13 -07:00
Dianne Hackborn
d998acb349 Fix issue #4445007: DPM initializes some values to 1, instead of 0 
Also fix not writing the settings file when an admin is removed.

And take care of an old to-do about not removing an admin until
after it has received the broadcast about it being disabled.

Change-Id: I4ebe0ea0461222b65425b2c5438b646b572f18c8
 2011-05-25 10:51:27 -07:00
Jeff Brown
395d6a291d Merge "Disable pointer debug logging." 2011-05-24 14:42:18 -07:00
Jeff Brown
9f2106f2bc Disable pointer debug logging. 
Change-Id: I00628fa369cb1b179a1907f9cb19de8ca4c755ab
 2011-05-24 14:40:35 -07:00
Jeff Brown
c1eb82373a Merge "Input device protocol enhancements." 2011-05-24 14:39:53 -07:00
Jeff Brown
80fd47ce75 Input device protocol enhancements. 
Added support for Linux multitouch protocol B (slots).

Added support for using the device's input properties as a hint
to determine the intended usage of a touch device.

Added support for the ABS_MT_DISTANCE axis.

Fixed a bug reporting the presence of the orientation axis.

Change-Id: Icf7b5a5a0f1a9cdf6ad2b35be8ea0c1a35815d48
 2011-05-24 14:39:19 -07:00
Jeff Brown
b5b1fb2585 Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-05-24 14:26:18 -07:00
Mike Lockwood
7cc9ee2676 am 859443f2: am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '859443f2a4d6a2b72c3e9c75720d32d4e4c09489':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-24 12:57:17 -07:00
Mike Lockwood
9fd4c6d3ae am 49b9449b: am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-24 12:56:56 -07:00
Jeff Brown
ebed7d6e35 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
 2011-05-24 12:01:25 -07:00
Mike Lockwood
859443f2a4 am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit 'c0d9834a1c6dd8d9cd0b7fe9b50495578c104405':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:45:17 -07:00
Jeff Sharkey
a462079303 Observe screen on/off events in NetworkPolicy. 
The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
 2011-05-23 18:39:56 -07:00
Jeff Sharkey
442fa21e98 Merge "APIs to profile network usage for current UID." 2011-05-23 18:38:04 -07:00
Mike Lockwood
c0d9834a1c am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '5d78e0b8ea548da3fa88ae2190a9334297b992b6':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:04:44 -07:00
Mike Lockwood
5d78e0b8ea Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 2011-05-23 18:01:50 -07:00
Mike Lockwood
4c12606852 GPS: Change NTP polling interval from 4 to 24 hours 
4 hours is excessive, and we want to save bandwidth on the NTP servers

Change-Id: Ic5ac4f4a8e62167206f3f620ea51635a2ea771d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:57:43 -04:00
Mike Lockwood
49b9449b66 am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:09:30 -07:00
Mike Lockwood
d8d8470825 am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-23 17:06:47 -07:00
Mike Lockwood
a5250c9392 MountService: Add StorageVolume as extra in storage related broadcasts. 
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-23 20:01:55 -04:00
Glenn Kasten
bdd8a16282 Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead" 2011-05-23 09:06:03 -07:00
Robert Greenwalt
8508485871 am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp 
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
  Simplfy getActive* calls in ConnectivityService
 2011-05-21 21:35:38 -07:00
Jeff Sharkey
eedcb9525b APIs to profile network usage for current UID. 
Added startDataProfiling() and stopDataProfiling() to TrafficStats,
which can be used by apps to measure network usage delta between two
points in time.  Currently takes two NetworkStats snapshots and returns
delta, which will eventually include tag-level granularity.  Added
tests for NetworkStats delta subtraction.

Added NMS.getNetworkStatsUidDetail() that returns stats for specific
UID.  Always gives stats access for the calling UID, otherwise enforces
that caller has permission.  Fix readSingleLongFromFile(), since
/proc/ files don't have well-defined lengths.

Change-Id: Ic5b6414d8effbd66846e275b00d4b8a82c74589d
 2011-05-21 15:02:58 -07:00
Robert Greenwalt
5a6bec53e2 resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp 
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
 2011-05-20 15:45:55 -07:00
Robert Greenwalt
599115894f Simplfy getActive* calls in ConnectivityService 
One had been simplified on GB, but somehow it didn't make it here.
bug: 4463770

Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
 2011-05-20 12:23:41 -07:00
satok
33bdc3c999 am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:51:14 -07:00
satok
d9435bcecc am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework 
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework
 2011-05-20 06:41:03 -07:00
satok
208d563404 Fix a bug on SwitchToLastInputMethod 
Change-Id: Iab7531e7436375941ec3df4fba943af24e2f1231
 2011-05-20 22:13:38 +09:00
satok
b4788fdbfd Do not merge. Backport two fixes for InputMethethodFramework 
Bug: 3420384

backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942

Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
 2011-05-20 22:11:54 +09:00
satok
4fc87d61c2 Fix switchToLastInputMethod to fall back into the applicable keyboard if there is no candidate ime 
Change-Id: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
 2011-05-20 18:03:37 +09:00
Dianne Hackborn
161e67ff3b resolved conflicts for merge of 06a8ceac to master 
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
 2011-05-19 21:44:52 -07:00
Mathias Agopian
9e735541be Merge "Fix a race that could cause GL commands to be executed from the wrong thread." 2011-05-19 19:42:20 -07:00
Mathias Agopian
6960811d15 Fix a race that could cause GL commands to be executed from the wrong thread. 
Change-Id: Ia3d407f7bf2f5553f46cfdade70b7b0badb35beb
 2011-05-19 19:40:02 -07:00
Dianne Hackborn
06a8ceacb0 am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:34:21 -07:00
Dianne Hackborn
c851ea5672 am 69cb8757: Add new "-swNNNdp" resource qualifier. 
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
  Add new "-swNNNdp" resource qualifier.
 2011-05-19 19:30:32 -07:00
Svetoslav Ganov
e219b5452c Merge "TouchExplorer - refactoring and a couple of bug fixes" 2011-05-19 18:29:45 -07:00
Svetoslav Ganov
91feae3c59 TouchExplorer - refactoring and a couple of bug fixes 
1. Refactored the code to avoid code duplication.

2. Fixed a bug in removing unused pointers from the event.

3. Fixed a bug that was crashing the explorer.

4. Sending hover exit immediately at the end of touch exploration
   gesture rather with a delay.

Change-Id: Ie288cb8090d6fb5e5c715afa6ea5660b17c019e0
 2011-05-19 18:29:01 -07:00
Dianne Hackborn
69cb87576b Add new "-swNNNdp" resource qualifier. 
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
 2011-05-19 18:23:29 -07:00
Mathias Agopian
f74bf9a47d Merge "Fix a crasher in SensorService" 2011-05-19 16:23:25 -07:00
Mathias Agopian
057f625cd9 Fix a crasher in SensorService 
SensorService main thread wasn't java-enabled. however, in
some situations we end-up calling into the BatteryService from
that thread which causes a crash.

Change-Id: Iffba90e4c4b743dba84d62f1342001a9db31916d
 2011-05-19 16:21:32 -07:00
Romain Guy
71fcc865e3 Merge "Code cleanup." 2011-05-19 16:16:43 -07:00
Romain Guy
88b4f153e2 Code cleanup. 
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
 2011-05-19 16:15:46 -07:00