Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,780 Commits 3 Branches 0 Tags
2a57694d0ae30eeca7239c7efae4e6bf478b781a
Commit Graph

32139 Commits

Author SHA1 Message Date
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
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
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
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
Kenny Root
41ec218e5f 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 '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
  Use hidden API to validate APK chains
 2014-04-18 22:50:12 +00:00
Kenny Root
6888bee598 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 '5a0cc78929bf56c153696ffa16b602acfcc40089':
  Use hidden API to validate APK chains
 2014-04-18 22:43:08 +00:00
Kenny Root
5a0cc78929 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 '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
  Use hidden API to validate APK chains
 2014-04-18 22:37:38 +00:00
Kenny Root
2ed5f771c4 am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
  Use hidden API to validate APK chains
 2014-04-18 22:31:08 +00:00
Kenny Root
4a62a6dce9 am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
  Use hidden API to validate APK chains
 2014-04-18 22:14:14 +00: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
128e937108 am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '106627e07cecfa8a9bcc43578fde78652fc59eba':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 20:00:33 +00:00
Robert Greenwalt
106627e07c am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit 'e42ce676f54742f2d47c26adaa90407c2cb8cec8':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:54:13 +00: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
74acf23a1e am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev 
* commit '3c417fbf21133340cbbe3539d87c453f81ae3a9d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-04-07 19:36:44 +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
2e582d1379 am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:44:37 -08:00
Paul Lawrence
9bce4032e9 am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '08ee74b1f1c4df28faa4168114853836cc471095':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:40:21 -08:00
Paul Lawrence
4be7c61a33 am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:24:05 -08: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

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
 2014-02-27 09:09:48 -08:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:12:35 -08:00
Robert Greenwalt
868d4c3410 am 95023066: DO NOT MERGE Sanitize WifiConfigs 
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
 2014-02-25 10:09:13 -08:00
Robert Greenwalt
950230663f 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: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

Conflicts:
	core/java/android/net/LinkProperties.java
	services/java/com/android/server/WifiService.java
	wifi/java/android/net/wifi/WifiStateMachine.java
 2014-02-24 15:20:32 -08:00
Selim Gurun
9dcac6f1a7 am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host 
* commit '0fed12396a12fd69b22c1b4ee4e27a93517eb6e2':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-11-07 15:14:33 -08:00
Selim Gurun
0fed12396a am de38b23d: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'de38b23d0f811bed29f462e580430fc3aa781049':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-11-07 15:10:58 -08:00
Selim Gurun
de38b23d0f DO NOT MERGE Add a delimiter between scheme and host 
Bug: 6923539

Change-Id: Ia78e185f00184c53babe00df3c852114ffd721f0
 2013-11-07 11:41:32 -08:00
Robert Greenwalt
458430d823 am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo 
* commit '5ab9af410e1ba572e8ac0577c2acb5324b65d66c':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-06 17:03:59 -07:00
Robert Greenwalt
5ab9af410e am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo 
* commit 'f76b5383cd568dcfafb6819449b846ff76072c44':
  DO NOT MERGE Un-deprecate getDhcpInfo
 2013-10-04 14:17:18 -07:00
Robert Greenwalt
f76b5383cd DO NOT MERGE Un-deprecate getDhcpInfo 
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
 2013-10-04 08:19:37 -07:00
Amith Yamasani
01c2e173d9 am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '490399292d2160cf94231df7a9e07e8aa8237489':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:55:34 -07:00
Amith Yamasani
490399292d am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '49eb1d958198b2a88455c340c9d072469d065785':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:51:09 -07:00
Amith Yamasani
49eb1d9581 am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit 'd084cc44eb59407c851399d548256c145eb45342':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:46:29 -07:00
Amith Yamasani
d084cc44eb am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '4f59a9216e76207a7003bfe010076aa78eee629a':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:31:18 -07:00
Amith Yamasani
4f59a9216e am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '12fd0f1644b28b6938a504492397e8ca8d38a1c5':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:25:20 -07:00
Amith Yamasani
9bf1a13948 am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate 
* commit '72c5e376879fb72548ef2a1c8d5b063853d174ee':
  Don't instantiate non-Fragments in Fragment.instantiate
 2013-09-27 11:17:57 -07: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