Commit Graph

25673 Commits

Author SHA1 Message Date
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
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

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 928ee1e48f)

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 aa2163dd2a

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 7323765bbf)

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
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
Joe Malin
8d40d04afa Notification.java javadoc: addAction
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
2012-11-07 12:39:22 -08: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
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 94740e6c33

Provided @JavascriptInterface to methods that are accessible from
js.

Clean cherry pick of b743a23fc5

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 d773ca8ff2

Change-Id: I033d29718d08803f375759faf83e2058df6d4906
2012-10-08 14:35:19 -07:00
Christopher Tate
ad8bda219e am 64d1f3ef: DO NOT MERGE - Full (local) restore security changes
* commit '64d1f3efd759b70462aecb6cf1d8c733872a8911':
  DO NOT MERGE - Full (local) restore security changes
2012-09-28 11:32:15 -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
3cda846725 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
  add analog clock attributes to docs
2012-09-26 11:47:38 -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
4feac67048 am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev
* commit '7c0edba0ab8803ff63ac006c8aead4fa0d1a15d8':
  Get your own cursor Drawables, WebViewClassic!
2012-09-20 16:43:25 -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
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 12:21:15 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 11:56:40 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Katie McCormick
844d2a942e Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 2012-09-17 10:57:22 -07:00
Elliott Hughes
086676a4a6 am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit 'f5437ee86a34751fa6d441b95282feb315e19eb6':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:36:33 -07:00
Elliott Hughes
f5437ee86a am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use."
* commit '297ad257464d2ea65cabd45ddb19f6da34b39157':
  Deprecate those parts of DateUtils the documentation says not to use.
2012-09-14 16:34:41 -07:00
Elliott Hughes
297ad25746 Merge "Deprecate those parts of DateUtils the documentation says not to use." 2012-09-14 16:12:36 -07:00
Elliott Hughes
d3c01012d8 Deprecate those parts of DateUtils the documentation says not to use.
Applications using these fields and methods are just asking for i18n bugs.

Also @deprecate two int[]s that were never meant to be public.

Change-Id: I29b3a1c0c663fe344d2567df6ed3bb537270b3b7
2012-09-14 16:06:50 -07:00
Robert Greenwalt
5d33e76cff am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-09-11 16:41:16 -05:00