32391 Commits

Author SHA1 Message Date
Deepanshu Gupta
4eab4e14c8 am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '5268248e0708951966e4f6514736a4030d5052da':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-13 02:20:47 +00:00
Deepanshu Gupta
0df5ae65a9 am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 02:20:42 +00:00
Deepanshu Gupta
175851600c am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '26c373213592ce7fb5a09f23a3d9d3ca0727e346':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
2014-05-13 02:20:38 +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
5268248e07 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
(cherry picked from commit 90ce58ecfdf7231611d70c849f14e5e71d1c8220)
2014-05-07 18:09:47 -07:00
Deepanshu Gupta
0f209967bf 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 094fd8ecb6f4b666be6c9e7332679bce28fdc3ca)
2014-05-07 18:09:46 -07:00
Deepanshu Gupta
26c3732135 Add missing layout params to xlarge action bar. [DO NOT MERGE]
layout_width and layout_height params were missing from the x-large
version of the action bar layout file.

Change-Id: Icef5575ae3d4ce9db6a966b7fa2be1921b9e860e
2014-05-07 18:09:46 -07: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 fe38489f6734fefd0a216e9cfe12f8f978ff371f)
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 76dccb7f436565136ff5e15b1ca57530940f5642)
2014-05-06 14:02:47 -07: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
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
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
2014-03-19 14:27:19 -07:00
Victoria Lease
1c12f9e762 malloc some advances
Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
2014-03-18 16:22:20 +00: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 5bab9daf3cf66f4de19f8757e386030e8bef23ce

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
2014-02-27 09:09:48 -08: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
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 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
2013-08-13 14:13:08 -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 aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
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
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
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 7323765bbf13d9638cf2cc1e06113bffcdac46c4)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
2013-03-25 13:44:34 -07: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
Robert Greenwalt
011132a7d3 am b8da0376: Secure a handful of framework broadcasts
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts
2012-11-30 10:05:33 -08:00
Robert Greenwalt
b8da0376f2 Secure a handful of framework broadcasts
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.

bug:7622253
(cherry picked from commit 47918ae3b4e7ebb54711884e9ff9d0300591ab8b)

Conflicts:

	core/res/AndroidManifest.xml

Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495
2012-11-29 13:06:23 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
Geremy Condra
8b73fc1ad3 am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects
2012-11-08 14:26:39 -08:00
Geremy Condra
2b4bc305a2 Merge "DO NOT MERGE Control access to tts objects" into jb-dev 2012-11-08 14:22:48 -08:00
Joe Malin
8d40d04afa Notification.java javadoc: addAction
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
2012-11-07 12:39:22 -08:00
Geremy Condra
b14c9900cb am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit 'a295ba44793e5601c8574bdcb07313420aa6500c':
  Change android.permission.SERIAL_PORT to signature|system.
2012-11-02 14:22:31 -07:00
Geremy Condra
a295ba4479 Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev 2012-11-02 14:19:46 -07:00
Selim Gurun
b2eeb1e192 DO NOT MERGE Control access to tts objects
Bug: 7073422

Control access to inherited methods of texttospeech JS objects.

Change-Id: Ieae0efaf1267108abd97cdac9e8604f6246cefb9
2012-11-01 14:17:02 -07:00
Geremy Condra
7dcacd559a Change android.permission.SERIAL_PORT to signature|system.
Bug: 7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb
2012-11-01 14:10:21 -07:00
Geremy Condra
3f54274006 am c2e3be5a: Merge "DO NOT MERGE Control access to inherited methods of jsinterface objects" into jb-dev
* commit 'c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d':
  DO NOT MERGE Control access to inherited methods of jsinterface objects
2012-10-09 21:37:23 -07:00
Geremy Condra
dadea723a3 am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev
* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface
2012-10-09 21:34:33 -07:00
Selim Gurun
534a67c557 DO NOT MERGE Control access to inherited methods of jsinterface objects
Bug: 7073422

Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.

Clean cherry pick of 94740e6c333a109be7516abbd17dd418f23b4f0c

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5bce9965c1539c3c8611614424a5aff

Add a glue logic to require use of annotations in injected accessibility
 objects.

Change-Id: I4135bd6787b2084177215302cd2c72afed090dc0
2012-10-09 18:42:15 -07:00
Selim Gurun
8d197601e7 DO NOT MERGE remove defunct javascript interface
Bug: 7073422

The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.

Clean cherry pick of d773ca8ff2a7a5be94d7f2aaa8ff5ef5dac501a8

Change-Id: I033d29718d08803f375759faf83e2058df6d4906
2012-10-08 14:35:19 -07:00