Deepanshu Gupta
a5461ebfae
resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev
...
Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
2014-05-13 09:40:35 -07:00
Deepanshu Gupta
9053261a54
am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 16:32:02 +00:00
Deepanshu Gupta
6d3c4ab245
am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]
...
* commit '43b15371f9f1da7d97fe0500eb1536d981097e31':
Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-13 02:20:23 +00:00
Deepanshu Gupta
052e0c589e
am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
* commit '770e40f839f059e1e3a15a2b14157c7cbb3b0553':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 02:20:20 +00:00
Deepanshu Gupta
43b15371f9
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 fe38489f67
2014-05-06 14:02:48 -07:00
Deepanshu Gupta
770e40f839
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
...
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit 76dccb7f43
2014-05-06 14:02:47 -07: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
ecb013dbff
Merge "Use hidden API to validate APK chains" into jb-dev
2014-04-18 17:12:40 +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
Robert Greenwalt
f52d1a56af
am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
...
* commit 'fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
2014-04-07 19:36:54 +00:00
Robert Greenwalt
e1549ae364
DO NOT MERGE Sanitize WifiConfigs
...
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:12663469
Change-Id: I80912cc08ffa1e4b63008c94630006cf316e7a64
2014-03-28 14:54:53 -07:00
Robert Greenwalt
fe38ff8d36
DO NOT MERGE Sanitize WifiConfigs
...
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:12663469
Change-Id: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
2014-03-28 11:38:33 -07:00
Paul Lawrence
5677513b7c
am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:20:24 -08:00
Paul Lawrence
da37ed8b0a
am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
...
* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
Prevent authenticators from using Settings to launch arbitrary activities.
2014-02-27 11:16:49 -08:00
Paul Lawrence
b9ba0c6c43
Prevent authenticators from using Settings to launch arbitrary activities.
...
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
This is a backport of 5bab9daf3c
2014-02-27 09:09:48 -08:00
Amith Yamasani
72c5e37687
am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
...
* commit 'ba1ae3af76466b94efedf06c4efac365fd7b9300':
Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:14:23 -07:00
Amith Yamasani
ba1ae3af76
am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
...
* commit '427864188dfc5dd803b15797379b9dc6673abd16':
Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:10:36 -07:00
Amith Yamasani
427864188d
Don't instantiate non-Fragments in Fragment.instantiate
...
Backport...
Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug: 9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d
2013-09-27 10:28:09 -07:00
Kenny Root
3bc3240ffb
am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
...
* commit 'a6226a2d202619ddb7e3e9765a3dc9f20241f853':
Use hostname verifier directly instead of instance
2013-08-13 17:31:32 -07:00
Kenny Root
a6226a2d20
am 32c99004: Use hostname verifier directly instead of instance
...
* commit '32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
2013-08-13 17:27:49 -07:00
Kenny Root
32c990044f
Use hostname verifier directly instead of instance
...
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit 928ee1e48f
2013-08-13 14:13:08 -07:00
Selim Gurun
758dfa0c33
am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:19:45 -07:00
Selim Gurun
3c4fa65480
am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:19:41 -07:00
Geremy Condra
b7787a317f
DO NOT MERGE Merge commit '8225df00' into bp
...
Add a delimiter between scheme and host
Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47
2013-04-18 11:40:09 -07:00
Selim Gurun
8237dd82bf
am 93c39d5d: DO NOT MERGE Fix issues during backport
...
* commit '93c39d5d4fe8a31da35f8d1d522acb7b676946af':
DO NOT MERGE Fix issues during backport
2013-04-05 12:05:52 -07:00
Selim Gurun
93c39d5d4f
DO NOT MERGE Fix issues during backport
...
Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.
Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
2013-04-04 16:31:01 -07:00
Selim Gurun
9d47e7b6d4
am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-04 11:08:35 -07:00
Selim Gurun
679c8f689f
am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '38915fd4d466cc233189bf5b5c11d7f03a416d35':
Revert "Add a delimiter between scheme and host"
2013-04-04 11:00:46 -07:00
Selim Gurun
7918cf4e6b
DO NOT MERGE Add a delimiter between scheme and host
...
Bug: 6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f
2013-04-04 11:00:25 -07:00
Selim Gurun
38915fd4d4
Revert "Add a delimiter between scheme and host"
...
This reverts commit aa2163dd2a
2013-04-04 17:14:29 +00:00
Selim Gurun
8225df007e
am aa2163dd: Add a delimiter between scheme and host
...
* commit 'aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8':
Add a delimiter between scheme and host
2013-04-03 21:05:40 -07:00
Scott Kennedy
f7c06ddbfc
Merge "docs: Typos and other fixes" into jb-mr1-dev
2013-04-03 16:16:35 +00:00
Selim Gurun
aa2163dd2a
Add a delimiter between scheme and host
...
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
2013-04-01 16:04:23 -07:00
Christopher Tate
9432f83cea
am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain
...
* commit '7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
Validate restored file paths against their nominal domain
2013-03-25 14:08:37 -07:00
Christopher Tate
7b3ac9add8
am 0cb27e28: Validate restored file paths against their nominal domain
...
* commit '0cb27e28071af59000198c8588c588a2e63cc0a3':
Validate restored file paths against their nominal domain
2013-03-25 14:05:47 -07:00
Christopher Tate
0cb27e2807
Validate restored file paths against their nominal domain
...
Bug 8460775
(cherry picked from commit 7323765bbf
2013-03-25 13:44:34 -07:00
Jeff Sharkey
67f2957331
am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.
...
* commit 'bb2aa63be4a9328403a4daa2f93b42a4a7b0b65d':
Tighten enforcement of file modes.
2013-03-01 17:23:40 -08:00
Jeff Sharkey
bb2aa63be4
am a2e929e1: Tighten enforcement of file modes.
...
* commit 'a2e929e1df62947b7967258f21fd05b27a571878':
Tighten enforcement of file modes.
2013-03-01 17:20:51 -08:00
Jeff Sharkey
a2e929e1df
Tighten enforcement of file modes.
...
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-03-01 16:17:09 -08:00
Katie McCormick
87cfad7d74
Doc change: Scroller Javadoc Bug # 7966653
...
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
2013-02-07 16:42:26 -08:00
Fabrice Di Meglio
a62dbfd953
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
...
Change-Id: I19b7a53c1c7d805fb9b1611e8944db27c82fc986
2013-01-30 12:30:03 -08:00
Scott Kennedy
a8396686a2
docs: Typos and other fixes
...
External 42844
External 42778
External 42768
External 42730
External 42720
External 42678
External 39381
Change-Id: Ia9d54ce87dc266650d0620fd3adc63137322e20b
2013-01-16 10:07:13 -08:00
Scott Kennedy
7ed189e457
docs: Fix a bunch of issues
...
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441
Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
2013-01-11 23:44:11 -08:00
Scott Main
cdf5106aaf
docs: a few doc bugs
...
Change-Id: I20d2ff2f3abfe674ca20f713c7213ee031c9bb1d
2013-01-08 20:07:31 -08:00
Scott Main
6aad995042
docs: resolve bugs from external tracker
...
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
2013-01-08 12:02:38 -08:00
Robert Ly
8ee2a70f08
change onEnd() to withEndAction() in javadocs
...
Change-Id: Ic9a04bf86d62249b47dc654052d58797dfc3990c
2012-12-17 15:00:08 -08:00
Fabrice Di Meglio
1e761ded55
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
2012-11-30 17:14:11 -08:00
Nicolas Klein
9f6cb87522
Fix some typos and missing @param in android.os.Bundle
...
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.
Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
2012-11-30 14:41:46 -08:00
Svetoslav Ganov
438a3b35f7
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
2012-11-30 11:43:54 -08:00
