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

84052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
5c807b4e84 Merge "Fix improper use of CloseGuard." into jb-mr1-dev 2012-08-27 17:21:12 -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
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
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
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
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
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
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
Dianne Hackborn
786b44046a Fix installing applications from non-primary users. 
We also now send the correct broadcasts to each user.

You no longer need to be running the shell as root
to be able to create/remove users.

Also added some more man page material to the pm command, and
got rid of a bunch of showUsage() calls that now make error
messages completely buried because of how large the usage info
has become.

And the package manager now shows the user each historical broadcast
was sent to.

Change-Id: Iab42498e1352a0c023069139c80fc04d2d69ab4b
 2012-08-27 15:16:33 -07:00
The Android Open Source Project
5b3652ccc8 am e9c7efda: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge 
* commit 'e9c7efda14e7d1c78e465e4208fec6fb6babce5d':
  Empty DC's apnList when the DC is free.
 2012-08-27 15:15:25 -07:00
Brian Muramatsu
6c0d4f00cb am a97ec810: Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev 
* commit 'a97ec810e0dd5fe493c1ac08545dcb7a9f93b723':
  Remove unused IntentFilter in LocationManager
 2012-08-27 15:14:14 -07:00
Adam Powell
c7c1d174b3 am ac137b32: Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev 
* commit 'ac137b3211818f9e72f9ffbaf541ad8a1ef27eb1':
  Add setOnDismissListener to AlertDialog.Builder
 2012-08-27 15:14:10 -07:00
Jeff Sharkey
f261d88f81 am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev 
* commit '116ee10b95ffff658618be42544ce80971ce28e8':
  Always-on VPN.
 2012-08-27 15:14:07 -07:00
Brian Muramatsu
a97ec810e0 Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev 2012-08-27 14:59:11 -07:00
Jeff Brown
3e7e7f025e Fix improper use of CloseGuard. 
Change-Id: I37131a86e27a4be55956384a3566de9dcfd90fe5
 2012-08-27 14:34:55 -07:00
Jeff Brown
4fd42e5a90 Remove unused "layer" argument from show(). 
Change-Id: I795edb8889bbacdf20fc54d755034040295f281a
 2012-08-27 14:34:55 -07:00
Jeff Brown
64a55af0ac Add plumbing for new surface flinger display API. 
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.

Added JNI for all of the new surface flinger display API calls.

Enforced the requirement that all Surfaces created by
the window manager be named.

Updated the display manager service to use the new methods.

Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
 2012-08-27 14:34:54 -07:00
Jeff Brown
0b722fe9ce Use new surface flinger API. 
Change-Id: Ic888577408a59a36481a48010e19c5e77c24e211
 2012-08-27 14:34:53 -07:00
The Android Open Source Project
e9c7efda14 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325
 2012-08-27 14:11:17 -07:00
Adam Powell
ac137b3211 Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev 2012-08-27 14:04:29 -07:00
Jeff Sharkey
116ee10b95 Merge "Always-on VPN." into jb-mr1-dev 2012-08-27 13:57:58 -07:00
Adam Powell
7f02dc5c9c Add setOnDismissListener to AlertDialog.Builder 
Add documentation to setOnCancelListener to clarify that the cancel
event plus the events for the various choice buttons are not the
exhaustive set of ways the dialog can be dismissed, and that a dismiss
listener should be used if the app needs to cover all cases of
dismissal.

Change-Id: I9e9d6f90f6f9ccaeb2c697474ab353e2d78f37b9
 2012-08-27 13:53:29 -07:00
Baligh Uddin
d4114d1aa3 Import translations. DO NOT MERGE 
Change-Id: Ief33e8fa1f5852b5fd221fafc7bc2f7407aca6d1
Auto-generated-cl: translation import
 2012-08-27 13:43:42 -07:00
Baligh Uddin
cbe5266a27 Import translations. DO NOT MERGE 
Change-Id: I07901e5eab6cc8aa560d713bf84efb1774456e48
Auto-generated-cl: translation import
 2012-08-27 13:23:32 -07:00
Dianne Hackborn
737e99d8d6 am e45ca31a: am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future" 
* commit 'e45ca31a613d8692a9db2117be96f442e57abfef':
  Fixes relative time formatting issue for dates in future
 2012-08-27 13:13:26 -07:00
Jean-Baptiste Queru
1b739ade4b am c77c6898: am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe" 
* commit 'c77c6898b3e0fd057d1f9d8696f467d29bc2441f':
  Make setCaptureRate locale safe
 2012-08-27 13:13:23 -07:00
Dianne Hackborn
e45ca31a61 am aae49432: am 4763989d: am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future" 
* commit 'aae4943297a08a659add964a3fef96bdfa0b2c14':
  Fixes relative time formatting issue for dates in future
 2012-08-27 13:10:58 -07:00
Jean-Baptiste Queru
c77c6898b3 am 3221b333: am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe" 
* commit '3221b33322b480fe9d4ba9dc0e7cd684ebe8c96a':
  Make setCaptureRate locale safe
 2012-08-27 13:10:57 -07:00