31513 Commits

Author SHA1 Message Date
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
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
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
1c12f9e762 malloc some advances
Bug: 13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
2014-03-18 16:22:20 +00: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
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
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
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
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
aa2163dd2a Add a delimiter between scheme and host
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
2013-04-01 16:04:23 -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
a2e929e1df Tighten enforcement of file modes.
Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
2013-03-01 16:17:09 -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
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
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
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
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
Christopher Tate
64d1f3efd7 DO NOT MERGE - Full (local) restore security changes
(1) Prevent full restore from creating files/directories that are
    accessible by other applications

(2) Don't restore filesets from "system" packages; i.e. any that runs
    as a special uid, unless they define their own agent for handling
    the restore process.

Bug 7168284

This is a cherry-pick from the originating tree.

Change-Id: I9f39ada3c4c3b7ee63330b015e62745e84ccb58f
2012-09-27 18:14:55 -07:00
Scott Main
8bf95ee635 am ed5ff3bd: add analog clock attributes to docs
* commit 'ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
  add analog clock attributes to docs
2012-09-26 11:45:21 -07:00
Scott Main
ed5ff3bdb0 add analog clock attributes to docs
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
2012-09-26 11:42:09 -07:00
Victoria Lease
ae2d7324a4 Get your own cursor Drawables, WebViewClassic!
These are shared resources! You can't just animate *everyone's*
cursors!

Bug: 7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
2012-09-20 15:09:24 -07:00
Katie McCormick
844d2a942e Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 2012-09-17 10:57:22 -07:00
Katie McCormick
0e9f34bffd Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
2012-09-10 16:20:20 -07:00
Adam Powell
9f3b0bfd0b DO NOT MERGE - Make WebView track focal points more accurately
Change-Id: I6683edee6933b1dd026453935d72119320ab3c81
2012-09-04 18:33:56 -07:00
Adam Powell
c4ce0da255 DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
2012-09-04 18:33:42 -07:00
Adam Powell
f1faf7743f Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev 2012-08-31 11:24:30 -07:00
Adam Powell
39263601cc DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
Bug 7088494

Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
2012-08-31 11:16:11 -07:00
John Reck
6fdd496308 Merge "DO NOT MERGE Remove dead code" into jb-dev 2012-08-30 14:50:17 -07:00
Adam Powell
ecb388efef Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev 2012-08-30 14:28:17 -07:00
Adam Powell
53059537c9 DO NOT MERGE - Use focal point for scrolling in GestureDetector
Remove workaround for obsolete touchscreen hardware. Provide a better
focal point for scroll events.

Change-Id: I173cd6696dace379437b56597c4a6ac5c7fbf60d
2012-08-30 13:23:22 -07:00
Adam Powell
d33b6217fc DO NOT MERGE - New implementation for ScaleGestureDetector
This solves the problems around active pointer tracking when the
caller may skip events in the MotionEvent stream and replaces the
old implementation with a much simpler algorithm.

Change-Id: I97c0bfad03a6190e403e843d382e05ff2257b66f
2012-08-30 13:18:43 -07:00
John Reck
2ec1098961 DO NOT MERGE Remove dead code
Cherry pick

Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
2012-08-28 16:29:51 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
2012-08-13 19:12:13 -07:00
mike wakerly
0099d67d68 Fix typo in UsbManager javadoc.
Closes http://b.android.com/32863

Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 16:31:26 -07:00
Scott Main
40eee61e25 docs: fix broken links
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
2012-08-06 18:04:23 -07:00
Scott Main
53b0fda5fd misc doc bugs.
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc  code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page

Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
2012-08-06 15:43:01 -07:00
Chris Wren
0bd664dab4 Add missing docs to notification style rebuilder functions.
Bug: 6914726
Change-Id: I13efae036610523ec6f83696d3337054e79856aa
2012-08-01 15:06:56 -04:00
Kenny Root
a39fdd11e8 Merge "Fix AccountManagerServiceTest" into jb-dev 2012-07-31 12:32:27 -07:00
Kenny Root
ae652cc97c Fix AccountManagerServiceTest
The MockAccountAuthenticatorCache needs to implement the new method.

Bug: 6820670
Change-Id: I5d1cb3aecec63602ae4541cd01ae8e28c8328e5a
2012-07-31 12:27:32 -07:00
Kenny Root
bba948dc9e Merge "Delay AccountManagerService initialization" into jb-dev 2012-07-31 11:14:02 -07:00