Commit Graph

3023 Commits

Author SHA1 Message Date
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
2015-11-13 01:50:11 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Matthew Williams
c0f39c1ece Sync extras bundle comparison can throw NPE
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033)
2015-11-11 14:34:04 +00:00
Amith Yamasani
460a7b4619 Limit cache update to packages that have changed
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.

Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
2015-02-09 11:10:31 -08:00
Jon Larimer
8b8d61952a am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '9570e144fe38a53c507838cc5234225c7a0da315':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:50:24 +00:00
Jon Larimer
9570e144fe am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:43:47 +00:00
Jon Larimer
ea63fd7f9b am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:36:59 +00:00
Jon Larimer
88add68942 am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:32:09 +00:00
Jon Larimer
a5ccca2427 am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:25:28 +00:00
Jon Larimer
2982d64802 am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:12:01 +00:00
Jon Larimer
de9a76ed99 am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:00:58 +00:00
Adam Lesinski
f741c37273 Fix ParceledListSlice to enforce the same concrete types among its elements.
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee0)
2015-01-28 10:47:54 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 18:36:45 +00:00
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 18:29:25 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
2015-01-16 09:54:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:14:44 +00:00
Dianne Hackborn
0ee10f6d26 Fix issue android-app doc, bump battery stats checkin version
Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version

Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a
2015-01-14 16:16:13 -08: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
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
2014-12-15 13:25:52 -08: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
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
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
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
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
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
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
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 16:03:09 -08:00
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
2014-11-19 15:29:47 -08:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process.
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
2014-11-19 14:29:10 -08:00
Jeff Brown
bba231d7a6 Explicitly bind AsyncTask to main looper.
It seems we were sort of trying to do this by forcing the AsyncTask
static initializer to run at certain times but it was not sufficiently
reliable.  In particular, this resulted in occasional system
server crashes.

Bug: 18192406
Change-Id: Ief73210c60e7680fbed6df74e3e58809b7ec7e4d
2014-11-14 17:22:31 -08:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
2014-11-12 22:24:24 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates.
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
2014-11-12 22:20:46 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
2014-11-12 13:16:06 -08:00