drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,007 Commits 1 Branch 0 Tags
Commit Graph

107007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Valdivia
55cab009f0 am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit '9272db024d013fbb48ec476c77562ab31d75a461':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:22:53 -08:00
Carlos Valdivia
9272db024d am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities. 
* commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
 2014-02-27 11:17:11 -08:00
Carlos Valdivia
c45bd7f209 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.

Bug: 7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit 5bab9daf3cf66f4de19f8757e386030e8bef23ce)
 2014-02-27 17:03:15 +00: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
David Christie
26c6c15f54 am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:53:27 -08:00
David Christie
b3c96c4c57 am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:50:18 -08:00
David Christie
1d151607fb am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '4013c4b18ccc66b510f4cdb222d4c04597975843':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:46:35 -08:00
David Christie
4013c4b18c am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:43:47 -08:00
David Christie
42d7a0bff5 am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:41:48 -08:00
David Christie
a7d13fabd6 am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:40:04 -08:00
David Christie
45aaa377c5 am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:36:49 -08:00
David Christie
a1b89310d5 am a87bdc1f: Merge commit \'bc39746e\' into manualmerge 
* commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 12:33:39 -08:00
Daniel Cashman
9ecadd7ced am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:53:31 -08:00
Daniel Cashman
6f34b9382f am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 
* commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
  Clear cached locations when location providers disabled Bug: 12118307
 2014-01-13 10:50:03 -08:00
Daniel Cashman
3238d0d9f9 Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev 2014-01-13 18:44:45 +00:00
David Christie
c454bbe805 am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'b15429a6853472207c2a4aefd22dd009e851edb7':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:24:05 -08:00
David Christie
b15429a685 am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:18:58 -08:00
David Christie
a87bdc1f8f Merge commit 'bc39746e' into manualmerge 2014-01-10 13:17:01 -08:00
David Christie
503c5a32a4 am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:14:04 -08:00
David Christie
ea47cb6763 am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:10:12 -08:00
David Christie
bf6cecc21f am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:05:35 -08:00
David Christie
5716e4bfb9 am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:02:48 -08:00
David Christie
776b3956a9 am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 13:00:09 -08:00
David Christie
7f4d82932c am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:55:24 -08:00
David Christie
bc39746ee9 am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307 
* commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
 2014-01-10 12:53:41 -08:00
David Christie
6826387e50 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa
 2014-01-06 18:15:05 -08:00
David Christie
8e0c7768c8 DO NOT MERGE: Clear cached locations when location providers disabled 
Bug: 12118307

Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
 2014-01-06 17:57:30 -08:00
David Christie
766b5c4342 Clear cached locations when location providers disabled 
Bug: 12118307

(cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c
 2014-01-06 15:30:34 -08:00
Christopher Tate
5d515f269b am fd706246: am 562fddce: am 05e3f55f: am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit 'fd70624629c42b0e0444a4d99ba64d58551fa6b0':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:56:07 -08:00
Christopher Tate
fd70624629 am 562fddce: am 05e3f55f: am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '562fddce2f154f8adec91cc8a4c4ef1fb4eabcfe':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:51:56 -08:00
Christopher Tate
562fddce2f am 05e3f55f: am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '05e3f55f17e36b415a23095dbeaa1d04716aed5a':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:47:43 -08:00
Christopher Tate
05e3f55f17 am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '1d8f592a752c30534a6e03889f1ba42b232770ef':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:45:38 -08:00
Christopher Tate
1d8f592a75 am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit 'ef12b1d4a9ba6a91b61647feadaf2c4cdf34c356':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:41:57 -08:00
Christopher Tate
ef12b1d4a9 am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit 'ea198841a9e64d72de49811e0e2c555eb2c40b9b':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:37:43 -08:00
Christopher Tate
ea198841a9 am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit 'ef4694cbdd2e374e063d5d89bcb7c4b041c20a30':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:36:05 -08:00
Christopher Tate
ef4694cbdd am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit 'ae229d991711745bdf8da2e716c31efde534e6da':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:34:13 -08:00
Christopher Tate
ae229d9917 am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '43253333d24e856a7ffef818fdfaedf3fd60d3b6':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:31:09 -08:00
Christopher Tate
43253333d2 am 50cbfd55: System package permission decls take precedence over 3rd party apps\' 
* commit '50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0':
  System package permission decls take precedence over 3rd party apps'
 2013-11-08 12:27:10 -08:00
Christopher Tate
50cbfd554f System package permission decls take precedence over 3rd party apps' 
In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.

Bug 11242510

(Cherry-pick backport to JB)

Change-Id: Iabf7b6280e6c6674a51af5624142bd19ea0750ed
 2013-11-07 19:04:22 -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
Katie McCormick
18ffec8582 am 928bc43f: am ab642495: Merge "Doc update: Managing System UI class" into jb-mr2-docs 
* commit '928bc43fb96400b4b4cc32a1b269781f0ea2da45':
  Doc update: Managing System UI class
 2013-10-30 16:38:58 -07:00
Katie McCormick
928bc43fb9 am ab642495: Merge "Doc update: Managing System UI class" into jb-mr2-docs 
* commit 'ab6424959ca0dd765f37944dbeaa59a50b99d7a4':
  Doc update: Managing System UI class
 2013-10-30 16:33:31 -07:00
Katie McCormick
ab6424959c Merge "Doc update: Managing System UI class" into jb-mr2-docs 2013-10-30 23:30:44 +00:00
Katie McCormick
d20c87c550 Doc update: Managing System UI class 
Change-Id: I8c8f8864411a4be64426e347351690078c922c1c
 2013-10-30 16:23:48 -07:00
Siva Velusamy
9e4514cd06 am 4062ae2e: am 3ebe71cb: Update AS download page for v0.3.1 
* commit '4062ae2ef958b009e8c2850ad249e45df1d476aa':
  Update AS download page for v0.3.1
 2013-10-25 18:40:40 -07:00
Siva Velusamy
4062ae2ef9 am 3ebe71cb: Update AS download page for v0.3.1 
* commit '3ebe71cb933d99461dfb3702fb4977f966df3713':
  Update AS download page for v0.3.1
 2013-10-25 18:37:35 -07:00