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

115957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
85bb9056fc am 7d167181: am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '7d16718105fc2ddf2fa2238df601f8316193e3a5':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:47:24 -07:00
Jason Monk
7d16718105 am 0aeca872: Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 
* commit '0aeca87233950933f4f48003f4ebaba342ee2ab8':
  Make setting PAC require CONNECTIVITY_INTERNAL
 2013-10-21 14:44:08 -07:00
Jason Monk
0aeca87233 Merge "Make setting PAC require CONNECTIVITY_INTERNAL" into klp-dev 2013-10-21 21:40:17 +00:00
Winson Chung
29ffafb62c am 5b0da90a: am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '5b0da90a68d00724da422b9d5e4b24244c101517':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:23:27 -07:00
Winson Chung
5b0da90a68 am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '1bab99c8cebbf23379c2ccad9188da1dce6fef09':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:20:57 -07:00
Winson Chung
1bab99c8ce Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 2013-10-21 21:16:23 +00:00
Alan Viverette
5c675074c7 am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit 'c5aa0ab2e8c47f0d16077abec1531998fbc5b415':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:55:51 -07:00
Alan Viverette
c5aa0ab2e8 am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit 'ba551061482780264ab5bc80381e480128789bb6':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:51:10 -07:00
Alan Viverette
ba55106148 Merge "Don't clip keyguard security container children (e.g. glow pad)" into klp-dev 2013-10-21 20:48:57 +00:00
Nick Kralevich
7a670250c9 Merge "Add system partition check for vpn dialogs" into klp-dev-plus-aosp 2013-10-21 20:21:15 +00:00
Jason Monk
1aeaf84a38 Make setting PAC require CONNECTIVITY_INTERNAL 
Also disables all setting of PAC networks through the internal AsyncChannel
methods.  PAC can only be saved through addOrUpdateNetwork for permission
checks.

Bug: 11316946
Change-Id: I51016b578080c342a5e5d536ea9a3fdd4fe16644
 2013-10-21 15:28:44 -04:00
Wink Saville
10f03972cc am 663345cb: am 089959a0: Merge "Fix typo for radio technology" into klp-dev 
* commit '663345cbd3d1ea11cad8e030d863b7082e5ec4a2':
  Fix typo for radio technology
 2013-10-21 12:07:05 -07:00
Wink Saville
663345cbd3 am 089959a0: Merge "Fix typo for radio technology" into klp-dev 
* commit '089959a063c437a5ad0114c0599d3790fa7cd5ab':
  Fix typo for radio technology
 2013-10-21 12:05:22 -07:00
Wink Saville
089959a063 Merge "Fix typo for radio technology" into klp-dev 2013-10-21 19:03:18 +00:00
Christopher Tate
fd6f5ca64a am 595c48e4: am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev 
* commit '595c48e43d8f40baaa8e281959300e582d765f56':
  Fix priv-app edge case across OTAs
 2013-10-21 11:36:32 -07:00
Christopher Tate
595c48e43d am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev 
* commit 'd570dae5775be9df8ee218ce617c50e8097e6dcc':
  Fix priv-app edge case across OTAs
 2013-10-21 11:33:35 -07:00
Christopher Tate
d570dae577 Merge "Fix priv-app edge case across OTAs" into klp-dev 2013-10-21 18:31:14 +00:00
Kenny Root
1ca39b82d8 am ddc91628: am a1b4d97b: Merge "Removed duplicate items on table of contents" 
* commit 'ddc91628819f02d6cfb60cfa26b582d52fa76cde':
  Removed duplicate items on table of contents
 2013-10-21 10:35:27 -07:00
Kenny Root
ddc9162881 am a1b4d97b: Merge "Removed duplicate items on table of contents" 
* commit 'a1b4d97b6920d3cd84fe19b07512a0de6996bb4c':
  Removed duplicate items on table of contents
 2013-10-21 10:31:23 -07:00
Kenny Root
a1b4d97b69 Merge "Removed duplicate items on table of contents" 2013-10-21 17:27:34 +00:00
Sungmin Choi
46401a312d Fix typo for radio technology 
Bug: 11317677
Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb
 2013-10-21 10:13:42 -07:00
Wink Saville
59e9e556fa am 6614220c: am 3b459214: Merge "Fix typo for radio technology" 
* commit '6614220cd4bf2b9eb280dc8cc83bd95658a8156a':
  Fix typo for radio technology
 2013-10-21 09:04:18 -07:00
Wink Saville
6614220cd4 am 3b459214: Merge "Fix typo for radio technology" 
* commit '3b459214f6e4682c75b58e101ce4679ecc1382b1':
  Fix typo for radio technology
 2013-10-21 09:01:38 -07:00
Victoria Lease
ed82a64828 am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev 
* commit '54b7e3e81c39a5e94fd3dcd67cc4eba0f56351f2':
  Implement language-specific GSUB processing
 2013-10-21 09:01:18 -07:00
Victoria Lease
54b7e3e81c am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev 
* commit 'a80d6424987602cc3141d4cb4cdee21a54747691':
  Implement language-specific GSUB processing
 2013-10-21 08:58:37 -07:00
Wink Saville
3b459214f6 Merge "Fix typo for radio technology" 2013-10-21 15:58:33 +00:00
Victoria Lease
a80d642498 Merge "Implement language-specific GSUB processing" into klp-dev 2013-10-21 15:55:30 +00:00
Deepanshu Gupta
7d641de1f6 am a14f25c5: am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev 
* commit 'a14f25c5ef85c026ff575bf7671d8dab8219ae89':
  Don't run the async query if being rendered in EditMode.
 2013-10-20 19:57:47 -07:00
Deepanshu Gupta
a14f25c5ef am bf3acff1: Merge "Don\'t run the async query if being rendered in EditMode." into klp-dev 
* commit 'bf3acff10a62adeb0e2cefc4652c62132445c196':
  Don't run the async query if being rendered in EditMode.
 2013-10-20 19:54:43 -07:00
Deepanshu Gupta
bf3acff10a Merge "Don't run the async query if being rendered in EditMode." into klp-dev 2013-10-21 02:51:20 +00:00
Scott Main
48f2a25a7f am e26c353c: am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'e26c353c4b32f252567887ddb97051546998c6ff':
  add xml attributes to IME javadoc
 2013-10-20 15:32:24 -07:00
Scott Main
e26c353c4b am bab3348f: Merge "add xml attributes to IME javadoc" into klp-dev 
* commit 'bab3348fc39e91b35c30ce05b6222cc5e8544104':
  add xml attributes to IME javadoc
 2013-10-20 15:30:49 -07:00
Scott Main
bab3348fc3 Merge "add xml attributes to IME javadoc" into klp-dev 2013-10-20 22:28:11 +00:00
Sungmin Choi
20a03ecc10 Fix typo for radio technology 
Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb
 2013-10-20 00:27:32 +00:00
John Spurlock
a5217f09c5 am 1eeb5ff2: am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit '1eeb5ff203a4aea5a4cfbe6c9982dc77cabd1f2b':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:07:48 -07:00
John Spurlock
1eeb5ff203 am d4595bd1: Merge "Move the IME navigation guard view up to decor." into klp-dev 
* commit 'd4595bd1e60ba03be3dac3cae3fc2d3ae2433c7d':
  Move the IME navigation guard view up to decor.
 2013-10-19 10:05:23 -07:00
John Spurlock
d4595bd1e6 Merge "Move the IME navigation guard view up to decor." into klp-dev 2013-10-19 17:03:55 +00:00
Jim Miller
51e4f39171 am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '495bd54c630691811e051247eec87e097c0bb01c':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:14:07 -07:00
Christopher Tate
628946a6ef Fix priv-app edge case across OTAs 
In this case:

   1. Privileged system app FOO is overlain by an installed update,
   2. FOO was replaced during an OTA,
   3. The new in-system FOO introduced new privileged permission requests
      that had not been requested by the original FOO,
   4. the update version of FOO still had a higher version code than
      the new FOO on the system disk, and
   5. the update version of FOO had been requesting these same (newly-
      added-to-system-apk) permissions all along;

then the newly-added privileged permission requests were incorrectly being
refused.  FOO should be able to use any privileged permission used by the
APK sited on the system disk; but instead, it was only being granted the
permissions used by the *original* version of FOO, even though the system
FOO now attempted to use them.

Still with me?

The fix is to (a) properly track privileged-install state when processing
known-to-be-hidden system packages, and (b) to tie the semantics of the
permission grant more explicitly to that evaluated state, rather than
using the prior (rather fragile) fixed-up privilege calculation applied
to the overlain apk's parse records.

Bug 11271490

Change-Id: Id8a45d667e52f3b5d18109e3620d5865f85bb9c9
 2013-10-18 18:11:05 -07:00
Jim Miller
495bd54c63 am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '42b7b6927cd31679691b216d1ba09be31c24206e':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:10:57 -07:00
Jim Miller
42b7b6927c Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 2013-10-19 01:08:12 +00:00
Jim Miller
4d20ed3f26 Revert "Fix dodgy states of keyguard transport controls" 
This reverts commit bdb5ac7ddbabec0ba947a32937d8b95738d513dc.

Change-Id: Iea8db9a590a2a3b65d941b2918345eb27f690240
 2013-10-19 01:00:16 +00:00
Nick Kralevich
212a195f00 Add system partition check for vpn dialogs 
The VPN permission check required internal knowledge that
other checks in the system would ensure that
package "com.android.vpndialogs" was genuine. In the
off chance those other checks change, or someone is
able to spoof the package name, this will at least
check to see that the app is on the system image; one
more hurdle to jump.

The original code for this change came from
https://android-review.googlesource.com/62270

Change-Id: I55580bee0b30036b0fee9ca4e43de9b736b194fe
Signed-off-by: William Roberts <wroberts@tresys.com>
 2013-10-18 17:48:39 -07:00
Jonathan Dixon
72950e65c8 am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit 'd47be031378e2ff43d61099ce5502f9428242eaf':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:40:44 -07:00
Jonathan Dixon
d47be03137 am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev 
* commit '43e533dea968bec3e53ba8046934145a0fa48a4f':
  Restore 4 classes that were accidentally deleted
 2013-10-18 17:37:53 -07:00
Jonathan Dixon
43e533dea9 Merge "Restore 4 classes that were accidentally deleted" into klp-dev 2013-10-19 00:35:23 +00:00
Svetoslav Ganov
8a51e2f48c am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit 'a53e1f81380c018705dc56ee82ec2db155f23489':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:32:57 -07:00
Svetoslav Ganov
a53e1f8138 am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '237575278de8cae5d20ee333fcb2ccceee257d67':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:29:05 -07:00
Svetoslav Ganov
237575278d Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 2013-10-19 00:26:44 +00:00
Jonathan Dixon
74fc73f62b Restore 4 classes that were accidentally deleted 
Bug 11291911

These deleted classes were previously public APIs and so need to remain
in the build (but hidden) in order to keep existing apps working.
(Partially reverts Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d)

Change-Id: I28e53b056f41e66645136f5e18fba2ff55a65fe5
 2013-10-18 17:10:34 -07:00