1115 Commits

Author SHA1 Message Date
Guang Zhu
dbe2aed24f am f0a3ea6e: am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit 'f0a3ea6ea259f836c71007ab07966d9dd2a140d6':
  make success explicit in BT instrumentation util
2014-04-29 23:12:16 +00:00
Guang Zhu
f0a3ea6ea2 am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit 'c6ebc0d120bd7faa61d2f906f4a180c720f1f0d8':
  make success explicit in BT instrumentation util
2014-04-29 23:09:12 +00:00
Elliott Hughes
bafab83995 am c4e6f6d2: am cf939672: am 2e9d924d: Merge "Remove unused import."
* commit 'c4e6f6d2827ad526f562a5882975f42eee69486c':
  Remove unused import.
2014-04-29 04:05:27 +00:00
Elliott Hughes
c4e6f6d282 am cf939672: am 2e9d924d: Merge "Remove unused import."
* commit 'cf939672f8c6e1ee29ae38f0e3665ab966491f7f':
  Remove unused import.
2014-04-29 04:01:25 +00:00
Elliott Hughes
f25f14eeba Remove unused import.
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
2014-04-28 20:51:34 -07:00
Guang Zhu
e47ebbeec6 make success explicit in BT instrumentation util
Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
2014-04-28 20:12:35 -07:00
Elliott Hughes
812ad2265e am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build."
* commit 'd937f2750c6edc2c1a03901605b22dad02b89147':
  Fix build.
2014-04-28 21:02:17 +00:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
2014-04-28 13:53:25 -07:00
Elliott Hughes
d937f2750c am 12928a07: am 2336c4ec: Merge "Fix build."
* commit '12928a07c5c19ac3dea6d0489506595c138b621a':
  Fix build.
2014-04-28 19:48:24 +00:00
Elliott Hughes
9790190fee Fix build.
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
2014-04-28 12:40:12 -07:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
2014-04-28 18:36:53 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
2014-04-28 11:11:32 -07:00
Jeff Sharkey
846318a325 Allow prefix-based Uri permission grants.
Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments.  For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission().  Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key.  (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions.  Move prefix
matching logic to Uri and add tests.  Add new flags to "am" tool, and
various internal uses around Intent and Context.  Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
2014-04-22 21:06:49 -07:00
Guang Zhu
bc3c1ad960 am 65bcc3ff: am 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev
* commit '65bcc3ff9212514a000ccdcc4d8295ddaedcef92':
  add bt instrumentation to run as a util
2014-04-22 13:33:13 +00:00
Guang Zhu
65bcc3ff92 am 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev
* commit '6c0454ecae4fe46b7032299d02fc6da80f171ed2':
  add bt instrumentation to run as a util
2014-04-22 13:27:56 +00:00
Guang Zhu
03800b8873 add bt instrumentation to run as a util
some bt test util methods are useful as device setup util, this
change exposes some of them via a BluetoothInstrumentation so
that they can be invoked like commands for setting up or
controlling bt state in test harness

Change-Id: I1d40baf374e145ab550ae4fa5f581e2eaf2e29bb
2014-04-21 19:06:17 -07:00
Jeff Davidson
6a4b220f12 Initial implementation of NetworkScoreManager's backing service.
This service will ultimately be responsible for propagating scores
down to lower-level network subsystems. For now, it just keeps scores
in memory and exposes these for debugging purposes via "adb shell
dumpsys network_score".

This change also adds provisioning of a default scorer. When
NetworkScoreService is first initialized, it checks to see if it has
ever set a default scorer; if not, it reads a package name from a
build config property and attempts to set it as the default.

Also add autogenerated equals/hashCode methods to all parcelables.

Bug: 14111427
Bug: 13786258
Change-Id: I02271171653d42e12acd240b73b9e23950744f6b
2014-04-21 16:04:05 -07:00
Jeff Davidson
dd6fd1e62b Class for managing the active scorer application.
Allows listing all possible scorer apps, getting the active scorer
app, setting the active scorer app, and determining whether a given
UID is for the active scorer.

Note that setting a default scorer with a system image will be handled
separately - the plan here is to add a read-only build property
containing a package name to use as the scorer out of the box.
When NetworkScorerService is initialized, it will check a provisioning
bit; if that bit isn't set, it will set the current scorer to the
package specified in this build property (if any) and set the
provisioning bit to true.

Bug: 13769362
Change-Id: I18c0b2ba2aceccc88b70c3611a49149e0bf17ecf
2014-04-16 14:17:01 -07:00
Jeff Davidson
dc960e21ef Data structures for communication with network scorer apps.
NetworkKey represents the necessary information to identify a network
to be scored. ScoredNetwork contains the key to identify a network as
well as a score to be used when evaluating that network (as a curve
based on RSSI).

Bug: 13767776
Change-Id: I6bfebd105c9381e615513167b4332b767b43a23a
2014-04-16 11:28:51 -07:00
Jorim Jaggi
d274c46432 Fix ugly black background when expanding/collapsing notifications.
Bug: 13635952
Change-Id: I7a0f434172db4583f904e6817d94ca12d3b117bc
2014-04-11 16:07:44 +02:00
Yohann Roussel
900224afc2 Merge "A stress test for concurent multidex extraction." 2014-04-09 09:49:58 +00:00
Jaewan Kim
baa00cc350 Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 2014-04-07 09:01:43 +00:00
Jaewan Kim
6789797485 Revert "Refactor IpConfiguration from WifiConfiguration"
This reverts commit 1284767ceb1affa6d5af77fd26ccf7322df48a6d.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
2014-04-07 09:01:24 +00:00
Jaewan Kim
ce245e1c65 Merge "Refactor IpConfiguration from WifiConfiguration" 2014-04-07 04:40:45 +00:00
Jaewan Kim
1284767ceb Refactor IpConfiguration from WifiConfiguration
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
2014-04-07 11:35:35 +09:00
Maxim Siniavine
962e12883b DownloadManager test will wait until certain progress, is made
during download before moving to next stage of the test.

Increase the timeout for waiting for download to complete.

Change-Id: I61820a9525256f4f2e16571e1ac075d2f5268cae
2014-04-03 19:46:51 -07:00
Yohann Roussel
3aac33e726 A stress test for concurent multidex extraction.
Change-Id: Iab2427a8867a2a7a9a12e2557b2e970430fa6356
2014-04-02 18:50:31 +02:00
Christopher Tate
f1977b4500 Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission.  Apps signed with the same certificate are
permitted to redefine permissions.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: Ifa4e59154dcccbb286ee46a35a6f25e4ad0f0f01
2014-03-27 12:37:47 -07:00
Glenn Kasten
1ee4eb074c Merge "Revert "Expand install observer semantics"" 2014-03-26 20:00:11 +00:00
Glenn Kasten
7629a18a3f Revert "Expand install observer semantics"
This reverts commit ab8a501f255b272af887acb0e66eb71cdf24c755.

Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
2014-03-26 19:59:48 +00:00
Christopher Tate
9067dc03ff Merge "Expand install observer semantics" 2014-03-26 19:24:09 +00:00
Christopher Tate
ab8a501f25 Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
2014-03-25 19:28:54 -07:00
Yohann Roussel
185a7e38bc Add one test application for multidex.
This application is intended to be run by
SupportMultidexHostTest.

Change-Id: Icace956cd68e03735fd8c73f877d911f01098f54
2014-03-24 11:28:31 +01:00
Xia Wang
454fc6b118 am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '560e75417252b502a41967aa4d819a029361e384':
  Fix state transition verification.
2014-03-18 22:34:17 +00:00
Xia Wang
560e754172 am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev
* commit '1b007565c73097728496f3dbe811a51c879ba89e':
  Fix state transition verification.
2014-03-18 22:22:37 +00:00
Xia Wang
01f03b50fb Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
2014-03-18 18:23:05 +00:00
Jeff Sharkey
432f755d44 am ac0f9ffd: am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"
* commit 'ac0f9ffda2a7e48d2d641654dafd11b8da39830a':
  Null pointer exception in FileRotator.java
2014-03-17 17:57:13 +00:00
Mikael Gullstrand
bbf1861fdd Null pointer exception in FileRotator.java
Sometimes a null pointer exception is thrown when examining files
managed by the file rotator.

The logs from the test show that the Wifi state is changed a large
number of times. On every state change, a write operation is
initiated on the file system. This will eventually result in out
of memory and the call to mBasePath.list() in the maybeRotate(...)
method in FileRotator.java will return null so the iteration will
throw a NullPointerException.

Change-Id: I5d5980d9593bc9ec75281169ca27ee591809903f
2014-03-13 17:25:01 +01:00
Maxim Siniavine
a305d7229f Fixes for download manager test.
When checking that the download is in progress, check the number number
of bytes downloaded as reported by download manager, rather than looking at the file size.

When waiting for the download to complete rely on the received broadcast.

Bug: 13326931

Change-Id: I4c2431dd71e17602e758bc482be185683040ea98
2014-03-12 18:22:02 -07:00
Xia Wang
6bed599aa7 Merge "Fix state transition verification." 2014-03-08 00:15:53 +00:00
Xia Wang
71aae0b6fd Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.

Bug: 13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
2014-03-06 16:09:05 -08:00
Yohei Yukawa
f06569561f Introduce InputMethodSubtypeArray for memory efficient IPCs
This CL introduces InputMethodSubtypeArray which compresses
multiple instances of InputMethodSubtype to reduce the risk
of TransactionTooLargeException during IPCs.

There are some IMEs which rapidly adding new subtypes into
their supported language list. One problem here is that each
instance of InputMethodInfo internally owns the list of
supported subtypes. Basically it requires additional
200 ~ 300 bytes for each subtype when InputMethodInfo is
transffered via IPCs. We should keep the size less than
100 KB in typical scenario.

With this CL, the list of InputMethodSubtype is marshalled
with GZIP compression. Approximately one InputMethodInfo is
marshalled within 10 KB even when it has 100 subtypes.

No negative performance impact is observed so far. The cost of
decompression seems to be compensated by another optimization
in this CL. Actually marshalling cost is reduced with this CL
by caching the compressed data on demand.

BUG: 12954290
Change-Id: Ibb2940fcc02f3b3b51ba6bbe127d646fd7de7c45
2014-03-06 11:25:57 +09:00
Xia Wang
0df3cdbc81 Merge "Add timer to wait for screen off" 2014-03-04 00:51:37 +00:00
Xia Wang
df362d264c Add timer to wait for screen off
bug#: 13278052

Change-Id: Ic4dc847f3f3fe86750343ffabedb13dbeb4f61a7
2014-03-03 15:39:46 -08:00
Yohei Yukawa
c18cd393f6 Make sure InputMethodInfo implements Parcelable transitively
This CL adds one more test to make sure InputMethodInfo
implements Parcelable correctly. This test makes sure that
one can marshall and unmarshall again from an unmarshalled
copy of InputMethodInfo.

BUG: 12954290
Change-Id: I5aa1552a8089fe0bac54513ba224e5bfc494be97
2014-03-03 14:14:10 +09:00
Yohei Yukawa
589800485d Add unit test for InputMethodInfo
This CL adds a unit test to make sure that InputMethodInfo
implements Parcelable correctly.

BUG: 12954290
Change-Id: I0abe8c266b4b035bf8ef4688d11069b355fabe9f
2014-02-27 17:32:48 +09:00
Yohann Roussel
1ec1370a5d Merge "Add support.multidex tests app for an update bug." 2014-02-26 16:23:34 +00:00
Yohann Roussel
05e2a94c8b Add support.multidex tests app for an update bug.
The failing scenario is
- install v1
- run
- update to v2
- update to v3
- run
last run was failing with initial multidex library versions because
it's still running on v1 extracted secondary dex files.

Change-Id: Id9811371fc70b0a4e9b49de913ee38d18699b21d
2014-02-26 17:02:13 +01:00
John Spurlock
8a985d24ce Tabs -> spaces in frameworks/base.
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
2014-02-25 09:49:29 -05:00
Narayan Kamath
b2e0733fe6 am 94b7c749: am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '94b7c749fd0bc5bbd80dbabfd412c2a212584343':
  Move Json{Reader,Writer} test to cts.
2014-02-17 18:32:44 +00:00