fionaxu
a0263a9909
DO NOT MERGE revert public api loadSafeLabel
...
am: f44c73abb2
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
Christopher Tate
f615799ef2
DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent()
...
am: d85a4ed283
2016-06-16 22:21:25 +00:00
Christopher Tate
d85a4ed283
DO NOT MERGE: Don't trust callers to supply app info to bindBackupAgent()
...
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug 28795098
Change-Id: I62710b15bb601fdfedd68e32349168c10725eb45
2016-06-14 13:28:33 -07:00
fionaxu
07c994012c
DO NOT MERGE fix build breakage on k
...
am: 4e33c4f8b1
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
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
Paul Jensen
8940d2b0ff
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
...
am: af0b4466ff
2016-05-26 13:30:59 +00:00
Paul Jensen
08ec0e53b8
Don't pass URL path and username/password to PAC scripts
...
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.
Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-29 10:57:13 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
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
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
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
Zach Jang
cff4e09e26
am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:09:55 +00:00
Zach Jang
bdf7f3583c
DO NOT MERGE - Backport of ag/748165 to klp-dev
...
Security patch level in Settings
b/23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:17:58 +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
Jon Larimer
e2b12b1fbc
am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:23:39 +00:00
Dianne Hackborn
92a5b0d59f
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
...
...can lead to launching of un-exported activities
We now validate the array map after unparcelling to make sure there
are no duplicate keys.
And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values. There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.
Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
(cherry picked from commit cee4cdad307071a8ff9a3e2189bf9e6fcc417222)
2014-09-10 21:55:27 +00: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
616141bdcc
am d9a137bd: am 77048379: Add view cookies for action bar menus. [DO NOT MERGE]
...
* commit 'd9a137bd84a0ebbcd34801da1442f8a6b0413c3e':
Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 01:52:25 +00:00
Deepanshu Gupta
d9a137bd84
am 77048379: Add view cookies for action bar menus. [DO NOT MERGE]
...
* commit '7704837947455909f295b088a3d15a20e107dbd7':
Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 01:44:29 +00:00
Mikhail Naganov
b76bc8e06e
am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit '6940b664093c7e66708b125957a2879e027e8cfa':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:08:58 +00:00
Mikhail Naganov
6940b66409
Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
Bug: 13694467
Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39
2014-05-08 10:10:24 +01:00
Deepanshu Gupta
7704837947
Add view cookies for action bar menus. [DO NOT MERGE]
...
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.
The change also contains a bugfix where a method wasn't renamed
properly.
Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 5ba2f230fa
2014-05-02 17:33:05 -07:00
Deepanshu Gupta
288d32b92b
am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
...
* commit '17e0eebdc6223de1f94b5ee538919adda9f58a9a':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-02 19:30:43 +00:00
Deepanshu Gupta
5a94ac6289
am 63a6de79: am 20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '63a6de79476e0d95a9bba2cc3599fc97a52bf6d5':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-02 19:30:33 +00: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
17e0eebdc6
am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
...
* commit '465cb53ba4b4a5edff9e9a63eb97d396b94d6568':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-02 19:24:00 +00:00
Deepanshu Gupta
63a6de7947
am 20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '20e0695b554e883b095f5223be10b6e1097db49f':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-02 19:23:54 +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
Griff Hazen
2c6131bba9
am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
2014-04-28 20:29:12 +00:00
Griff Hazen
293977bdb0
Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
...
The logic was opposite.
Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
2014-04-28 10:32:21 -07:00
Deepanshu Gupta
465cb53ba4
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
...
When running in edit mode, do not use the application info to get the
icon, since it will be null.
Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c
2014-04-25 20:48:46 -07:00
Deepanshu Gupta
20e0695b55
Action bar rendering in layoutlib [DO NOT MERGE]
...
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.
This also relies on some changes to the plugin to pass the correct params.
Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 4ccc4bd54f
2014-04-25 19:22:14 -07: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
Deepanshu Gupta
126f4057a0
am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]
...
* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
Add view cookies for action bar menus. [DO NOT MERGE]
2014-04-24 01:27:45 +00:00
Deepanshu Gupta
5ba2f230fa
Add view cookies for action bar menus. [DO NOT MERGE]
...
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.
The change also contains a bugfix where a method wasn't renamed
properly.
Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f90
2014-04-23 18:04:21 -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
