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

84768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
0d43c567ce am 393e3170: am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 
* commit '393e3170b3f52a3e191554ffd8c8f81821ba2074':
  SystemUI: Fix data activity overlay not being removed when data is disabled
 2012-08-28 13:41:19 -07:00
Jean-Baptiste Queru
8d8646471c am 1112a376: am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter" 
* commit '1112a376e81af8ef4c2b661f5bda443596ba37da':
  Change StringTokenizer to TextUtils.StringSplitter
 2012-08-28 13:41:15 -07:00
Baligh Uddin
1104fadd76 Import translations. DO NOT MERGE 
Change-Id: I37cdf72141038d6677c0ffe3f1ef6f65bf6fd78a
Auto-generated-cl: translation import
 2012-08-28 13:34:07 -07:00
Baligh Uddin
f0b8748d96 Import translations. DO NOT MERGE 
Change-Id: I48ca6880e612f2241744c5647e2850b5045cc898
Auto-generated-cl: translation import
 2012-08-28 13:32:53 -07:00
Baligh Uddin
0d51d679b2 Import translations. DO NOT MERGE 
Change-Id: I4739f1d06aba86718416cde965590fe9535bde51
Auto-generated-cl: translation import
 2012-08-28 13:30:55 -07:00
Baligh Uddin
b868630d09 Import translations. DO NOT MERGE 
Change-Id: Id90d0a550391a158c9a56a085944802ae8251ea0
Auto-generated-cl: translation import
 2012-08-28 13:21:02 -07:00
Daniel Sandler
393e3170b3 am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 
* commit 'ad955fe87f44b43dbb2842fdcbe4e62900b5a07f':
  SystemUI: Fix data activity overlay not being removed when data is disabled
 2012-08-28 13:19:52 -07:00
Jean-Baptiste Queru
1112a376e8 am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter" 
* commit '416362e6d8c8d0a34e09704138688f75aa810c9b':
  Change StringTokenizer to TextUtils.StringSplitter
 2012-08-28 13:19:48 -07:00
Baligh Uddin
3b87a57aca Import translations. DO NOT MERGE 
Change-Id: Ia11f923dfd05112764cd795034e5a8b33b2d67fe
Auto-generated-cl: translation import
 2012-08-28 13:10:55 -07:00
Wink Saville
7dc531f9dd am cae99e57: am 97d28d92: Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev 
* commit 'cae99e57febb2790036c4a398a6ebce9919ce762':
  Unhide some CellSignalStrength methods.
 2012-08-28 13:02:42 -07:00
Jean-Baptiste Queru
5b231a4dbd am e8f24cc2: am a3b63c00: am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 
* commit 'e8f24cc2678240c502d6d6156fd88bc0fa129de1':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
 2012-08-28 13:02:29 -07:00
Daniel Sandler
ad955fe87f Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 2012-08-28 12:52:49 -07:00
Wink Saville
cae99e57fe am 97d28d92: Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev 
* commit '97d28d92c9a42db71d1855286fdd122e6b19ecef':
  Unhide some CellSignalStrength methods.
 2012-08-28 12:37:07 -07:00
Wink Saville
97d28d92c9 Merge "Unhide some CellSignalStrength methods." into jb-mr1-dev 2012-08-28 12:34:22 -07:00
Jean-Baptiste Queru
416362e6d8 Merge "Change StringTokenizer to TextUtils.StringSplitter" 2012-08-28 12:22:39 -07:00
Wink Saville
82e6ee62b2 Unhide some CellSignalStrength methods. 
When submitting originally I'd missed unhiding these methods.

Change-Id: I627a5ea0c8c29b6ddfe5b1c49f9c0789d5e86456
 2012-08-28 12:05:16 -07:00
Jean-Baptiste Queru
e8f24cc267 am a3b63c00: am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 
* commit 'a3b63c001cfd04121708e2bd67af5c8eb855baa1':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
 2012-08-28 11:17:48 -07:00
Jean-Baptiste Queru
a3b63c001c am 337756fa: am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 
* commit '337756fa6587bca84afdfdc964805f962ea534ed':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
 2012-08-28 11:13:38 -07:00
Jean-Baptiste Queru
337756fa65 am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 
* commit '78ad66b43cf5b649869de18ee9c246c95b135c10':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
 2012-08-28 11:08:22 -07:00
Jean-Baptiste Queru
78ad66b43c Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 2012-08-28 10:43:10 -07:00
Przemyslaw Szczepaniak
ed9a656565 am 2d27c5cb: am 70574efd: Fix threading issue in BlockingAudioTrack. 
* commit '2d27c5cb8d98b65576a8ec4e6e553c19d08f1d71':
  Fix threading issue in BlockingAudioTrack.
 2012-08-28 02:26:21 -07:00
Przemyslaw Szczepaniak
2d27c5cb8d am 70574efd: Fix threading issue in BlockingAudioTrack. 
* commit '70574efd8f7105eb73a6ffe31992ed3c5971c8cc':
  Fix threading issue in BlockingAudioTrack.
 2012-08-28 02:24:17 -07:00
Przemyslaw Szczepaniak
70574efd8f Fix threading issue in BlockingAudioTrack. 
This fixes the issue where one thread calls .stop() on
mAudioTrack that was released (or being released) by other thread.

Bug: 7029291
Change-Id: Ia6db803e8ee40379b63327acf578466127cfabcb
 2012-08-28 02:19:20 -07:00
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