Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,641 Commits 3 Branches 0 Tags
e8a4fa857f840e513efbef53cd39daecfffd8ed3
Commit Graph

84641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
e8a4fa857f am 5751fe47: am c5fd6e59: Fix build 
* commit '5751fe47954f7755295a874babe8a61fcbeff195':
  Fix build
 2012-08-28 02:07:52 -07:00
Irfan Sheriff
5751fe4795 am c5fd6e59: Fix build 
* commit 'c5fd6e59db10bb0069cf64394dce3955234757c1':
  Fix build
 2012-08-28 02:05:47 -07:00
Irfan Sheriff
c5fd6e59db Fix build 
Change-Id: Id17b70154b3f8a101457b20fb37db0a16159dff9
 2012-08-28 02:02:21 -07:00
Irfan Sheriff
749728e391 Merge commit '949dcad8' into manualmerge 
Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2
 2012-08-27 23:03:50 -07:00
Irfan Sheriff
949dcad839 am da6da090: Captive portal handling 
* commit 'da6da0907b28d4704aabbdb1bbeb4300954670d1':
  Captive portal handling
 2012-08-27 22:35:36 -07:00
Irfan Sheriff
da6da0907b Captive portal handling 
We now notify the user of a captive portal before switching to the network as default.
This allows background applications to continue to work until the user confirms he
wants to sign in to the captive portal.

Also, moved out captive portal handling out of wifi as a seperate component.

Change-Id: I7c7507481967e33a1afad0b4961688bd192f0d31
 2012-08-27 22:27:06 -07:00
Amith Yamasani
e4e7bf4f86 am 42ec61f9: am 10a0df84: Merge "Relax permission requirement for sending broadcasts to other users" into jb-mr1-dev 
* commit '42ec61f970c7c7e5e441e415afb59948d1ad4f94':
  Relax permission requirement for sending broadcasts to other users
 2012-08-27 19:37:28 -07:00
Amith Yamasani
42ec61f970 am 10a0df84: Merge "Relax permission requirement for sending broadcasts to other users" into jb-mr1-dev 
* commit '10a0df8459d22b29fb9163071e8cbc2bb7194393':
  Relax permission requirement for sending broadcasts to other users
 2012-08-27 19:35:43 -07:00
Amith Yamasani
10a0df8459 Merge "Relax permission requirement for sending broadcasts to other users" into jb-mr1-dev 2012-08-27 19:33:42 -07:00
Amith Yamasani
8bf06edac2 Relax permission requirement for sending broadcasts to other users 
Also handle USER_CURRENT for broadcasts

Change-Id: I2df5616ac22b7c670a7d007b8d505d4d4d99a24e
 2012-08-27 19:30:30 -07:00
Irfan Sheriff
d6112c1146 am e9395e1a: am bf3218f6: am 129d6fac: am 67ea8c86: Merge "Added a persistent feature in WiFi Direct." 
* commit 'e9395e1a3c12f055dfc65565aafe5b81f37c4118':
  Added a persistent feature in WiFi Direct.
 2012-08-27 18:08:18 -07:00
Irfan Sheriff
e9395e1a3c am bf3218f6: am 129d6fac: am 67ea8c86: Merge "Added a persistent feature in WiFi Direct." 
* commit 'bf3218f64de1692ca26c67b1911af856d81e186c':
  Added a persistent feature in WiFi Direct.
 2012-08-27 18:06:12 -07:00
Irfan Sheriff
bf3218f64d am 129d6fac: am 67ea8c86: Merge "Added a persistent feature in WiFi Direct." 
* commit '129d6fac00545d6ea4eee75f25ddb3ffe8452bb9':
  Added a persistent feature in WiFi Direct.
 2012-08-27 18:03:51 -07:00
Irfan Sheriff
129d6fac00 am 67ea8c86: Merge "Added a persistent feature in WiFi Direct." 
* commit '67ea8c86419ffbf603052e816d6b1e9e7e20fbb9':
  Added a persistent feature in WiFi Direct.
 2012-08-27 17:57:29 -07:00
Irfan Sheriff
67ea8c8641 Merge "Added a persistent feature in WiFi Direct." 2012-08-27 17:54:07 -07:00
Jeff Brown
9315bda432 am 87f67b72: am 5c807b4e: Merge "Fix improper use of CloseGuard." into jb-mr1-dev 
* commit '87f67b727c4256e05de17eece2e62e89aa8f7da2':
  Fix improper use of CloseGuard.
 2012-08-27 17:26:19 -07:00
Jeff Brown
87f67b727c am 5c807b4e: Merge "Fix improper use of CloseGuard." into jb-mr1-dev 
* commit '5c807b4e84e193aed2062a97d3a4c840a72ea868':
  Fix improper use of CloseGuard.
 2012-08-27 17:23:47 -07:00
Jeff Brown
27c3e7ec3a am b0af690d: am 233c6670: Merge "Remove unused "layer" argument from show()." into jb-mr1-dev 
* commit 'b0af690daef34899dd16413fea36791cbba23d70':
  Remove unused "layer" argument from show().
 2012-08-27 17:23:29 -07:00
Jeff Brown
dd6261eb23 am 398a6cbe: am dc7d8008: Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 
* commit '398a6cbe51bfe8d4c11942ddf9c438aaa8d3cbac':
  Add plumbing for new surface flinger display API.
 2012-08-27 17:23:25 -07:00
Jeff Brown
5c807b4e84 Merge "Fix improper use of CloseGuard." into jb-mr1-dev 2012-08-27 17:21:12 -07:00
Jeff Brown
0e274c2f1a am abd696f7: am ac66d4a8: Merge "Use new surface flinger API." into jb-mr1-dev 
* commit 'abd696f7d43bb137f674c3a4b04fd128818897b5':
  Use new surface flinger API.
 2012-08-27 17:20:05 -07:00
Jeff Brown
b0af690dae am 233c6670: Merge "Remove unused "layer" argument from show()." into jb-mr1-dev 
* commit '233c667061ae0f5efcf4ea9409f36485a78f52c0':
  Remove unused "layer" argument from show().
 2012-08-27 17:19:43 -07:00
Jeff Brown
398a6cbe51 am dc7d8008: Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 
* commit 'dc7d8008eceb08850142fcd77a97404b4fbe688d':
  Add plumbing for new surface flinger display API.
 2012-08-27 17:19:39 -07:00
Jeff Brown
abd696f7d4 am ac66d4a8: Merge "Use new surface flinger API." into jb-mr1-dev 
* commit 'ac66d4a8d653331a03c27d5444467fd943503c9b':
  Use new surface flinger API.
 2012-08-27 17:17:42 -07:00
Jeff Brown
233c667061 Merge "Remove unused "layer" argument from show()." into jb-mr1-dev 2012-08-27 17:17:40 -07:00
Jeff Brown
dc7d8008ec Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev 2012-08-27 17:16:53 -07:00
Jeff Brown
ac66d4a8d6 Merge "Use new surface flinger API." into jb-mr1-dev 2012-08-27 17:15:25 -07:00
John Reck
3d227674fe am 12d8776b: am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev 
* commit '12d8776b8667946a6741f85013a24373900df830':
  Protect against focus changes after .destroy()
 2012-08-27 16:59:34 -07:00
John Reck
12d8776b86 am f9202718: Merge "Protect against focus changes after .destroy()" into jb-mr1-dev 
* commit 'f920271828f654dec2a72240e73a940247f25315':
  Protect against focus changes after .destroy()
 2012-08-27 16:57:02 -07:00
John Reck
f920271828 Merge "Protect against focus changes after .destroy()" into jb-mr1-dev 2012-08-27 16:54:18 -07:00
John Reck
1612fab07b Protect against focus changes after .destroy() 
Bug: 7026042

Change-Id: I656b612a4b5304225863d3100a98bf2b97d9890d
 2012-08-27 16:44:39 -07:00
Baligh Uddin
effedf422c am dd724226: (-s ours) am 81efbb30: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'dd7242262f1c30cc380cc62e9a8c2cc8d9a054b2':
  Import translations. DO NOT MERGE
 2012-08-27 16:23:01 -07:00
Baligh Uddin
dd7242262f am 81efbb30: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '81efbb30f07d3c2d48b43659dd443ceb625505d2':
  Import translations. DO NOT MERGE
 2012-08-27 16:21:14 -07:00
Baligh Uddin
81efbb30f0 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-27 16:17:57 -07:00
Baligh Uddin
5f18da2b8f am e7f484f2: (-s ours) am 38b97a31: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e7f484f26d7547fe841ee7decaf74f7cbc0b53ca':
  Import translations. DO NOT MERGE
 2012-08-27 16:17:43 -07:00
Baligh Uddin
e6f6854b36 Merge "Import translations. DO NOT MERGE" 2012-08-27 16:16:28 -07:00
Baligh Uddin
e7f484f26d am 38b97a31: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '38b97a316c64f094d5fc2636a6634c6f4b580ab7':
  Import translations. DO NOT MERGE
 2012-08-27 16:14:46 -07:00
Baligh Uddin
38b97a316c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-27 16:11:39 -07:00
Baligh Uddin
5eb7b1b9d8 Merge "Import translations. DO NOT MERGE" 2012-08-27 16:10:36 -07:00
Dianne Hackborn
4a49b0940d am f748711d: am 0e17e5bc: Merge "Fix installing applications from non-primary users." into jb-mr1-dev 
* commit 'f748711d7bbfa082247daeb6e67083f5797532af':
  Fix installing applications from non-primary users.
 2012-08-27 16:04:52 -07:00
Dianne Hackborn
f748711d7b am 0e17e5bc: Merge "Fix installing applications from non-primary users." into jb-mr1-dev 
* commit '0e17e5bc43373ff9dd8d567f876a26f990ed638e':
  Fix installing applications from non-primary users.
 2012-08-27 16:02:52 -07:00
Dianne Hackborn
0e17e5bc43 Merge "Fix installing applications from non-primary users." into jb-mr1-dev 2012-08-27 15:59:56 -07:00
Charles Chen
f743a5da0b am 3ff601e7: am 40edfc97: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev 
* commit '3ff601e730c48252f50bc3eebdb424b4d9c5e2ca':
  Reload page when A11y is on and the JavaScript state changes.
 2012-08-27 15:48:19 -07:00
Charles Chen
3ff601e730 am 40edfc97: Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev 
* commit '40edfc97795e34b1f24b15ca8f0ccba37fa1efbc':
  Reload page when A11y is on and the JavaScript state changes.
 2012-08-27 15:45:34 -07:00
Charles Chen
40edfc9779 Merge "Reload page when A11y is on and the JavaScript state changes." into jb-mr1-dev 2012-08-27 15:42:39 -07:00
The Android Open Source Project
79ad6d7591 am 92dc4a82: (-s ours) am 5b3652cc: am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '92dc4a823050da909a06488584bb10b4de60871c':
  Empty DC's apnList when the DC is free.
 2012-08-27 15:22:59 -07:00
alanv
c98b34608b Reload page when A11y is on and the JavaScript state changes. 
Bug: 6910403
Change-Id: I85af7d2019a02c1a6cc17b0c4930276b7fb69e33
 2012-08-27 15:21:09 -07:00
The Android Open Source Project
92dc4a8230 am 5b3652cc: am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit '5b3652ccc89e3f94080d810aa1149f09d221f413':
  Empty DC's apnList when the DC is free.
 2012-08-27 15:19:30 -07:00
Brian Muramatsu
c80c696385 am 6c0d4f00: am a97ec810: Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev 
* commit '6c0d4f00cb6b589652e55b9e542dd0254f16ce3f':
  Remove unused IntentFilter in LocationManager
 2012-08-27 15:17:48 -07:00
Adam Powell
000de44012 am c7c1d174: am ac137b32: Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev 
* commit 'c7c1d174b39ca4d81f42069799f7891de5102158':
  Add setOnDismissListener to AlertDialog.Builder
 2012-08-27 15:17:45 -07:00