fionaxu
a0263a9909
DO NOT MERGE revert public api loadSafeLabel
...
am: f44c73abb2
Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
2016-06-30 22:25:47 +00:00
fionaxu
f44c73abb2
DO NOT MERGE revert public api loadSafeLabel
...
Bug: 28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
2016-06-27 23:52:19 -07:00
fionaxu
07c994012c
DO NOT MERGE fix build breakage on k
...
am: 4e33c4f8b1
Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
2016-06-08 01:49:39 +00:00
fionaxu
4e33c4f8b1
DO NOT MERGE fix build breakage on k
...
Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
2016-06-07 17:55:27 -07:00
fionaxu
4c50846519
Backport loadSafeLabel changes
...
am: be2865a60a
Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126
2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a
Backport loadSafeLabel changes
...
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
* commit '60351d3be29977dfe0b422de797a0429edf500b7':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
2016-04-11 22:00:27 +00:00
Todd Kennedy
60351d3be2
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-07 16:40:18 -07:00
Matthew Williams
06ef7dfdf0
DO NOT MERGE Redact Account info from getCurrentSyncs
...
am: a5cafd2a93
* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93
DO NOT MERGE Redact Account info from getCurrentSyncs
...
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698 )
2016-01-21 14:15:11 +00:00
Shreyas Basarge
294611faa8
Sync extras bundle comparison can throw NPE
...
am: 2f137b7705
* commit '2f137b7705875ee026319abb8e512d918c118222':
Sync extras bundle comparison can throw NPE
2015-11-13 01:41:59 +00:00
Shreyas Basarge
2f137b7705
Sync extras bundle comparison can throw NPE
...
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
2015-11-12 15:32:44 +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
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
Ricardo Cervera
92f6a74708
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
...
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
2014-11-05 08:55:51 -08:00
Andrew Solovay
b59608981f
am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
...
* commit '9562863cf184fe99be223aff9700b3ceb8559e1a':
doc: Updated branding guidelines per request from @deniseamling.
Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-22 22:41:55 +00:00
Andrew Solovay
de0c99e89b
Noted that OnSharedPreferenceChangeListener does not store a strong reference
...
to the listener.
Because of this, the listener is susceptible to garbage collection unless the
caller preserves a strong reference to it. We suggest that the caller store a
reference to the listener in an instance field of an object that will exist as
long as the listener is needed.
Also fixed code sample formatting in Settings.jd (some lines were overlong).
Docs are staged in:
http://asolovay.mtv:8901/guide/topics/ui/settings.html#Listening
http://asolovay.mtv:8901/reference/android/content/SharedPreferences.html#registerOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener)
Bug: 10437648
Change-Id: I48f5b87fa2ca7a240661d0cc00114d225819d54d
2014-05-19 16:05:06 -07:00
Deepanshu Gupta
cebf960525
am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '9b1c46df60dec6af81b9cbfcbf8a70192da66d64':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-02 19:30:30 +00:00
Deepanshu Gupta
9b1c46df60
am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '3c00b28bf60ab01b449e16df045238f4bae4d700':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-02 19:23:50 +00:00
Deepanshu Gupta
3c00b28bf6
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
Cherry picked from klp-dev from
Change-Id: If1e7187645f0b0388f7b97d742395efd228b347a which was
cherrypicked from master with the following
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit f1e7187645 )
2014-04-25 18:58:15 -07:00
Kenny Root
89a086c16f
am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
Use hidden API to validate APK chains
2014-04-18 23:05:30 +00:00
Kenny Root
cf677a37fb
am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'e00c9185262c675f1680920c258413299995042a':
Use hidden API to validate APK chains
2014-04-18 23:00:37 +00:00
Kenny Root
e00c918526
am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
Use hidden API to validate APK chains
2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f
am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
Use hidden API to validate APK chains
2014-04-18 22:50:12 +00:00
Kenny Root
6888bee598
am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
Use hidden API to validate APK chains
2014-04-18 22:43:08 +00:00
Kenny Root
5a0cc78929
am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
2014-04-18 22:37:38 +00:00
Kenny Root
2ed5f771c4
am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
2014-04-18 22:31:08 +00:00
Kenny Root
4a62a6dce9
am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
2014-04-18 22:14:14 +00:00
Kenny Root
451ed5f077
am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
2014-04-18 21:33:04 +00:00
Kenny Root
3ecaa88d83
am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
2014-04-18 18:14:32 +00:00
Kenny Root
16c6b177ee
Use hidden API to validate APK chains
...
Bug: 13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
2014-04-17 14:03:33 -07:00
Deepanshu Gupta
863848808d
am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit 'f1e7187645f0b0388f7b97d742395efd228b347a':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-04-16 18:37:10 +00:00
Deepanshu Gupta
f1e7187645
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db )
Conflicts:
core/java/android/content/res/Resources.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
2014-04-15 20:03:19 -07:00
Ricardo Cervera
90a5f9851a
docs: Added permissions note for Context.getFilesDir. Bug: 13716053
...
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
2014-04-04 10:26:05 -07:00
John Spurlock
5237a792aa
am 8c44c394: Doc fixups to ContentResolver, MediaRouter.
...
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
Doc fixups to ContentResolver, MediaRouter.
2014-03-03 16:57:22 +00:00
John Spurlock
8c44c394bf
Doc fixups to ContentResolver, MediaRouter.
...
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
2014-03-03 10:14:41 -05:00
John Spurlock
e05190eae7
am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
...
* commit '85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.
2014-01-14 19:50:38 +00:00
John Spurlock
3390018c6b
Docfixes: three typos and escape */*.
...
Change-Id: I418d855b5d08a1a20eaca3d8e4d2e5d0fca23dd5
2014-01-06 11:44:42 -05:00
John Spurlock
56979b2234
am 125d133b: Fix bad @see links in Intent.java.
...
* commit '125d133bcce56403a9b4d1cdbbc61a7cb1d7f8e1':
Fix bad @see links in Intent.java.
2013-11-25 18:39:33 +00:00
John Spurlock
125d133bcc
Fix bad @see links in Intent.java.
...
Change-Id: Ifa283214798f8d2de4f8bdb17ed78609a7d43293
2013-11-25 11:58:37 -05:00
Christopher Tate
99437f252b
Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
2013-11-14 22:59:20 +00:00
Christopher Tate
ba629da331
Ensure recipient can be launched before attempting broadcast delivery
...
User removal or eviction inherently races with broadcast delivery. This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.
Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.
We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.
Bug 11652784
Bug 11272019
Bug 8263020
Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Matthew Williams
a7456e46f4
SyncManager now returns copy on getCurrentSyncs()
...
Bug:11559103
Added a new getCurrentSyncsCopy() that is public. The other version
is needed for internal SSE calls.
Change-Id: I0287f039a6f75abf04b65b85cb30f78353aeef4f
2013-11-13 18:17:54 -08:00
Jeff Sharkey
8a2998eade
Better enforcement in DocumentsProvider.call().
...
Use ContentProvider.enforceWritePermissionInner() to handle all edge
cases around checking if caller has write permissions. This fixes
bug where call() would throw if caller and provider were the same app.
Bug: 11464234
Change-Id: Iace8e0e4243d56ed1cdcc9680383103975107036
2013-10-31 14:55:44 -07:00
Jeff Sharkey
e8c00d8ed4
Improve DocumentsProvider and contract docs.
...
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
2013-10-15 16:44:22 -07:00
Jeff Sharkey
adef88a0a9
Improve OPEN/CREATE_DOC docs.
...
Bug: 10936473
Change-Id: I4378aaaf927f114982191efd4f9887dad075390d
2013-10-15 13:54:47 -07:00