6160 Commits

Author SHA1 Message Date
Mike Lockwood
8df5fcfa62 am 6d60190a: am e502c536: am b3174c46: UsbService: Fix JNI reference leak
* commit '6d60190a3156e0ac69c800bbb10691b70ae9bd54':
  UsbService: Fix JNI reference leak
2011-06-10 10:32:16 -07:00
Ben Komalo
2447edd85b New device policy to disable camera.
This introduces a new policy that a DeviceAdmin can use to disable _all_
cameras on the device. A separate CL will be made on the media side to
watch this policy bit and act accordingly.

Bug: 4185303
Change-Id: I700cfc4a8317bb74087ccae39346d74467fc58b2
2011-06-10 09:37:17 -07:00
satok
21e2f1b4a0 Merge "API to set additional subtypes" 2011-06-10 00:26:52 -07:00
satok
e7c6998e0a API to set additional subtypes
Bug: 4321667

- Due to the voice team's strong request

Change-Id: Ia8bbc277c0987bde996e6f65541877cec96a3ca1
2011-06-10 15:26:03 +09:00
Dianne Hackborn
7bbf6f7d11 am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '8297f669356ee997c5faa745815e8b9a7009fba7':
  Fix for not reporting correct "sw" in compat mode.
2011-06-09 18:42:55 -07:00
Mathias Agopian
a8eedaee41 Merge "improve orientation sensor with gyro data" 2011-06-09 18:22:19 -07:00
Dianne Hackborn
f741e679c4 resolved conflicts for merge of e2aa0490 to master
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
2011-06-09 17:50:36 -07:00
Irfan Sheriff
70a1c1190d Merge "WifiWatchdogService refactor" 2011-06-09 15:47:08 -07:00
Isaac Levy
188cecfdb6 WifiWatchdogService refactor
Minor refactoring of WatchdogService ahead of logic changes.
Lightly tested on a stingray.

Change-Id: I051603a598fe3162f170fb0a09e461fcb9b0038e
2011-06-09 13:55:15 -07:00
Mike Lockwood
6d60190a31 am e502c536: am b3174c46: UsbService: Fix JNI reference leak
* commit 'e502c5364f8e715eb0da54441460b8f3cb76b7ff':
  UsbService: Fix JNI reference leak
2011-06-09 12:50:23 -07:00
Mike Lockwood
e502c5364f am b3174c46: UsbService: Fix JNI reference leak
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
  UsbService: Fix JNI reference leak
2011-06-09 12:01:31 -07:00
Jeff Brown
9429e6ebe4 am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
* commit '92110af24a9a93b73264560b57f55f45ec65dab5':
  Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-09 11:56:21 -07:00
Mike Lockwood
b3174c46ad UsbService: Fix JNI reference leak
http://code.google.com/p/android/issues/detail?id=17365

Change-Id: Ice0174e0db2a785d32ac16694ebf3b7ddb1b7fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-09 14:48:11 -04:00
Dianne Hackborn
1fdc061e99 am 816e5b72: am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit '816e5b72190787f2b6136925c172a00ebcbe4077':
  Remove compat mode dialog.
2011-06-09 11:24:32 -07:00
Jeff Sharkey
3f3913550c Persist network stats using AtomicFile.
Implements read/write of network stats using AtomicFile, along with
magic number and versioning.  Stores in "/data/system/netstats.bin"
for now.  Tests to verify that stats are persisted across a simulated
reboot, and to verify that TEMPLATE_WIFI is working.

Fixed bug where kernel counters rolling backwards would cause negative
stats to be recorded; now we clamp deltas at 0.

Change-Id: I53bce26fc8fd3f4ab1e34ce135d302edfa34db34
2011-06-09 10:14:13 -07:00
Dianne Hackborn
8297f66935 am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '3aabdeaceff8405406d90c329a6691552559556d':
  Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:38:03 -07:00
Dianne Hackborn
3aabdeacef am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
2011-06-08 22:35:25 -07:00
Dianne Hackborn
48a7651823 Fix for not reporting correct "sw" in compat mode.
Change-Id: Ia225c94b36ccc3589d417aafd5680247678eddfd
2011-06-08 22:26:33 -07:00
Christopher Tate
13f99a0d0e Merge "Fix handling of directory entries" 2011-06-08 20:13:57 -07:00
Christopher Tate
e9e78ecd2c Fix handling of directory entries
Don't emit tar blocks for directories with an invalid nonzero size.  Also, if
such an entry is encountered during restore, don't actually attempt to treat
it as valid and thus skip over the next actual tar entry.

This patch also adds tracking of the data actually consumed during restore,
and reports a total at the end of stream.

Change-Id: I625173f76df3c007e899209101ff2b587841f184
2011-06-08 20:11:49 -07:00
Mathias Agopian
f8a6737f3d improve orientation sensor with gyro data
when we do our own sensor fusion, we also export an
improved orientation sensor and hide the HAL sensor.
The fused orientation sensor is much more precise, fast
and smooth.

Change-Id: I0ea843b47ad9d12f6b22cce51f8629852d423126
2011-06-08 20:06:50 -07:00
Dianne Hackborn
e2aa04908c am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
2011-06-08 20:06:40 -07:00
Dianne Hackborn
a1396dfe7a am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
2011-06-08 20:02:43 -07:00
Dianne Hackborn
5fd2169eab Work on issue #4518815: Compatibility mode introduces compatibility regression...
...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components.  This addresses everything
I could find.

Unfortunately it does *not* fix this particular app.  I am starting to think this
is just an issue in the app.  This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
2011-06-08 18:45:43 -07:00
Chia-chi Yeh
ff3bdca31f The service part of the user space VPN support.
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
2011-06-08 14:16:42 -07:00
Jeff Brown
92110af24a am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
* commit '5f0b1721eece5ca614044cda638f11fbec0eab0a':
  Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 14:04:33 -07:00
Jeff Brown
5f0b1721ee am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2
* commit '25bd8abce993e17b382ea5c29a1cb68dd095cf45':
  Fix swipe gesture cosine calculation. Bug: 4124987
2011-06-08 13:52:22 -07:00
Mike Lockwood
9eb014aeb0 UsbManager: Clean up extras for ACTION_USB_STATE broadcast
Also added name for new PTP USB function

Change-Id: Ia2775ba2b23ef6a6108ca7e060239eb51c2eecc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-08 09:17:45 -07:00
Jeff Sharkey
19862bf5d0 Compute range-based usage in NetworkStatsHistory.
When given a start/end range, interpolate between buckets to return
the total network usage.  Used to summarize detailed UID stats.  Method
to combine NetworkStatsHistory regardless of bucket size.  Used to
combine all histories matching a template.

Added tests for both methods.

Change-Id: Ia463910c0ecf7cf08dcf97c658ad99742bd6b882
2011-06-07 23:54:28 -07:00
Jeff Sharkey
61ee0bbb5b UID network stats, secure settings, and random.
Collect UID-granularity network stats during regular poll event.  Add
dumpsys argument to generate fake historical data for debugging, and
move stats parameters to Settings.Secure.

Change-Id: I09b36a2955dc10c697d4b9c3ff23dcb3ac37bd70
2011-06-07 23:43:46 -07:00
Jeff Sharkey
d2a458750e Map network identity using ConnectivityService.
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
2011-06-07 23:09:25 -07:00
Svetoslav Ganov
dd82b85677 Merge "Crash in the TouchExplorer" 2011-06-07 19:29:20 -07:00
Svetoslav Ganov
00f7b3f765 Crash in the TouchExplorer
1. No clearing the last touch explore event in all cases
   when transitioning to another mode.

2. Incorrectly assuming the the action index of an up/down
   events is 0.

bug:4551506

Change-Id: I43f8e800b54a340968489dc924a539795a9195cb
2011-06-07 19:27:56 -07:00
Chia-chi Yeh
5bc7c93ca7 Merge "Do not register the callbacks in the constructor." 2011-06-07 18:18:56 -07:00
Jeff Brown
cb0c55ed37 am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
2011-06-07 17:52:53 -07:00
Jeff Brown
051e8f2bfa am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2
* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987
2011-06-07 17:52:22 -07:00
Jeff Brown
774ed9d953 resolved conflicts for merge of 8b2c0014 to master
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
2011-06-07 17:48:39 -07:00
Irfan Sheriff
f596955372 am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE
* commit '5e4d0206486378ffc7d2992750e439d54df15147':
  Handle AsyncChannel disconnect in WifiService
2011-06-07 17:19:02 -07:00
Dianne Hackborn
aefc94f19a am 4bd50588: am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2
* commit '4bd505883df3d8ca7583d854f1c71302c615519d':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
2011-06-07 17:18:16 -07:00
Jeff Brown
25bd8abce9 Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2 2011-06-07 16:58:06 -07:00
Jeff Brown
6674d9bf0a Fix swipe gesture cosine calculation.
Bug: 4124987

Recent changes introduced a multiplication factor into the
distance calculation which ended up being absent from the
dot product calculation.

Change-Id: Ia367912b9ac09b6285d5a498a0c271563c9e9e39
2011-06-07 16:50:14 -07:00
Dianne Hackborn
816e5b7219 am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit 'ee3de4a950a188c6a4d5fb732242249af4807837':
  Remove compat mode dialog.
2011-06-07 15:56:05 -07:00
Dianne Hackborn
ee3de4a950 am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2
* commit 'a3ce0f1e6f92e9580b0b0cbdc6cc124d2163f6c5':
  Remove compat mode dialog.
2011-06-07 15:47:14 -07:00
Dianne Hackborn
a3ce0f1e6f Merge "Remove compat mode dialog." into honeycomb-mr2 2011-06-07 15:45:14 -07:00
Dianne Hackborn
2947826931 Remove compat mode dialog.
Change-Id: I37bccdf9d3e7c56048633da5731ad111910e530f
2011-06-07 15:44:22 -07:00
Christopher Tate
ba4b2faa09 Merge "Fix embedded spaces in tar stream EVEN HARDER" 2011-06-07 15:20:34 -07:00
Irfan Sheriff
2391a98314 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Irfan Sheriff
5ea65d609f Update walled garden detection logic
DNS based techniques dont always work. Some hotspots
redirect on data fetch on IP. Use a known pattern match
on URL to detect a walled garden instead.

Also, added gservices capability to turn off the feature
or change the URL & the pattern to match

Bug: 4378442
Change-Id: I78b4208d3ea3ace20069169e7c01ed769892d94d
2011-06-07 15:10:58 -07:00
Mathias Agopian
c8c39b6c5b am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit 'a6a4a9ed46d02ec0c6493a97cd1d3351bdcced63':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
2011-06-07 15:02:53 -07:00
Mathias Agopian
a6a4a9ed46 am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)
* commit 'f6c8206735e7e078461e5f2aef6e1a1446fdd075':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
2011-06-07 14:58:02 -07:00