Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
179,073 Commits 3 Branches 0 Tags
02cab444fbcedcee50b8563d80f87cd6b125d85d
Commit Graph

3031 Commits

Author SHA1 Message Date
Alan Viverette
d6ebb3a75e Remove null entries from constant state cache 
We insert null entries on cache miss, which can cause NPE on prune, but
we ought to remove these entries during prune.

BUG: 18842826
Change-Id: I9c0bca04f34575d1403de943abd8d12b18c9c032
 2015-01-05 11:09:29 -08:00
Michael Wright
3979c0bf42 resolve merge conflicts of 342e903 to master. 
Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb
 2014-12-30 12:59:10 -08:00
Michael Wright
342e903000 am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit '95700457139803af54a5e731816cedf1c924f3a6':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:51:20 +00:00
Michael Wright
446e019a06 Add MEDIA_PROJECTION_SERVICE to the ServiceName list. 
This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
 2014-12-23 17:01:49 -08:00
Jeff Sharkey
c4ec5b633e Iterate based on index, not key. 
Bug: 18785949
Change-Id: I5d92fedac9f71b997f87f7035635fde276756faa
 2014-12-17 10:24:13 -08:00
Jay Shrauner
081d7d5091 am 58d66c30: am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev automerge: 59e96ee 
* commit '58d66c30d78a70c7bb5d2a62669ed64d6931b777':
  Fix NPE in Transport.applyBatch
 2014-12-16 01:53:20 +00:00
Jay Shrauner
58d66c30d7 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
automerge: 59e96ee

* commit '59e96ee423f4fc810f29451144143a581a8cd99a':
  Fix NPE in Transport.applyBatch
 2014-12-16 01:45:09 +00:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Alan Viverette
43cd1ddc81 Merge "Prune the resource cache before adding new caches" 2014-12-15 20:03:10 +00:00
Dianne Hackborn
69ff299e79 am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev automerge: 7557ec1 
* commit '9b287368b05f36e322f339b82d2bb495f230ca50':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 21:59:37 +00:00
Dianne Hackborn
9b287368b0 am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
automerge: 7557ec1

* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 19:21:58 +00:00
Dianne Hackborn
80b1c5608e Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#... 
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.

Check for null.

Also fix some small issues with converting intents to/from intents.

Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
 2014-12-09 20:22:08 -08:00
Alan Viverette
9267fda30c Prune the resource cache before adding new caches 
BUG: 18666986
Change-Id: I5f7e4983100c2d5e4478a4d82c21bb59fa87810e
 2014-12-08 20:29:01 +00:00
Mike Lockwood
210d9d94cf Merge "MIDI Manager work in progress" 2014-12-08 18:46:38 +00:00
Mike Lockwood
67f8e8bd89 MIDI Manager work in progress 
Still to do:

Add MidiInputPort and MidiOutputPort classes
Schedule sending MIDI events in the future
Security/permissions
Reconsider interface for virtual devices
Look into performance optimizations

Change-Id: I9b7d63b196996a04be0a830efa913043da1328a8
 2014-12-08 10:45:37 -08:00
Eino-Ville Talvala
1aef3b1eb4 am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:44:58 +00:00
Dianne Hackborn
c22369be46 am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit '3c8a439be33932f35b723271cec5cd4210c19221':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:44:53 +00:00
Eino-Ville Talvala
431b65d11f am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3 am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:23:25 +00:00
Eino-Ville Talvala
d23f8b44d5 Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 2014-12-03 22:01:42 +00:00
Dianne Hackborn
f696efa206 Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 2014-12-03 21:32:17 +00:00
Eino-Ville Talvala
08a125562c Revert "Camera: Add new capability flags as system features as well" 
This reverts commit 6aee1d2ba5.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
 2014-12-03 11:12:39 -08:00
Dianne Hackborn
1bc177c585 Fix issue #17948584: Application crash and phone restart when app... 
...is installed with <provider> with empty string.

Don't allow empty authorities, just like we don't allow null authorities.

Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
 2014-12-03 10:20:30 -08:00
Tor Norbye
0ab6472237 Merge "Add BIND_IMPORTANT to @BindServiceFlags" 2014-12-03 17:38:41 +00:00
Alan Viverette
6c23ba0d8d am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev 
* commit 'a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
  Deprecate one-arg getDrawableForDensity, update currents.txt
 2014-12-02 23:45:25 +00:00
Alan Viverette
a6f8b2ce55 Deprecate one-arg getDrawableForDensity, update currents.txt 
BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff
 2014-12-02 15:26:33 -08:00
Alan Viverette
0cd6296c0a am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev 
* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
 2014-12-02 23:19:28 +00:00
Adam Lesinski
9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:07:43 +00:00
Alan Viverette
c10e3960d9 Deprecate Resources.getDrawable(int) in favor of the two-arg version 
This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8
 2014-12-02 14:58:08 -08:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Tor Norbye
ce1c67cdd7 Add BIND_IMPORTANT to @BindServiceFlags 
bindService calls passing BIND_IMPORTANT is being flagged
as invalid in Android Studio because our tools metadata
(derived from @BindServiceFlags) does not know that BIND_IMPORTANT
(and BIND_ADJUST_WITH_ACTIVITY) are allowed.

https://code.google.com/p/android/issues/detail?id=81489

Change-Id: Ifad899f581f01c96bff46e304013219b80710c87
 2014-12-02 14:02:06 -08:00
Adam Lesinski
44a711ccac am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public
 2014-11-25 18:44:31 +00:00
Alan Viverette
67c55be39a am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '0d05788fd06b24068c269bfa80dd96deafb00357':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:49:53 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
 2014-11-25 17:39:16 +00:00
Adam Lesinski
9be305d146 Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 2014-11-25 00:51:10 +00:00
Alan Viverette
760cfb02de Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 2014-11-24 21:57:51 +00:00
Adam Lesinski
aa6076701d Make the Context service constant for UsageStats public 
This was an oversight in L, where we did not make this
service constant public.

Change-Id: I42e38cb5ef8420cadc1a4a6705821189d911ccfe
 2014-11-24 13:53:57 -08:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs. 
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
 2014-11-24 12:13:11 -08:00
Alan Viverette
7e0aaae3db Check for null drawable in theme-less getDrawable() 
BUG: 18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
 2014-11-24 11:27:09 -08:00
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:06:09 +00:00
Eino-Ville Talvala
bd9567e156 am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 
* commit 'e289082a7066a86032190aa100425ce29cd2a4f2':
  Camera: Add new capability flags as system features as well
 2014-11-24 18:05:40 +00:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:08:16 -08:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Alan Viverette
47379f3050 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:49:04 +00:00
Dianne Hackborn
24b1c23c62 Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION 
You now need to set a flag if you want this unsafe behavior.

Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
 2014-11-20 17:17:39 -08:00
Eino-Ville Talvala
6aee1d2ba5 Camera: Add new capability flags as system features as well 
Also add all the L and L MR1 new system features to the uses-feature documentation.

Bug: 18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
 2014-11-20 15:52:40 -08:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit baf21da1e1.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
 2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00