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

51180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
a0bb3acba1 am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '59a3319ffce100d671145b5bfee7450038b250bf':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-23 20:48:36 -07:00
Tadashi G. Takaoka
23186b88bd Merge "Add new imeFullscreenBackground for Theme.InputMethod.Holo" 2011-05-23 19:00:01 -07:00
Jeff Sharkey
348a48fc70 Merge "Observe screen on/off events in NetworkPolicy." 2011-05-23 18:47:11 -07:00
Jeff Sharkey
a462079303 Observe screen on/off events in NetworkPolicy. 
The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
 2011-05-23 18:39:56 -07:00
Mathias Agopian
8c777edea2 Merge "fix x86 build" 2011-05-23 18:39:40 -07:00
Jeff Sharkey
442fa21e98 Merge "APIs to profile network usage for current UID." 2011-05-23 18:38:04 -07:00
Tadashi G. Takaoka
75d27bc52e Add new imeFullscreenBackground for Theme.InputMethod.Holo 
This change also removes unnecessary background from ExtractEditText

Bug: 4431328
Change-Id: I1b35ddd388fe11cac9b7f9dd3f990b6c4d889185
 2011-05-24 10:27:43 +09:00
Wink Saville
9ddcdd98d9 am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE 
* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
  Fix broken data retry
 2011-05-23 18:25:52 -07:00
Mathias Agopian
f56a960105 fix x86 build 
Change-Id: I03cfbfeaeb8b13842248856b14b4a23711036e10
 2011-05-23 17:48:36 -07:00
Adam Powell
7d372b49e2 am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-23 17:18:54 -07:00
Wink Saville
ed5af6d93b am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 
* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
  Change getLteOnCdmaModeStatic to dynamically determine its result.
 2011-05-23 17:18:29 -07:00
Dianne Hackborn
37cd57772b Merge "resolved conflicts for merge of 070a19e0 to master" 2011-05-23 16:59:20 -07:00
Steve Block
560e97f8e0 Merge "Log a StrictMode violation when WebView methods are called on the wrong thread" 2011-05-23 14:34:00 -07:00
Dianne Hackborn
939461300a resolved conflicts for merge of 070a19e0 to master 
Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411
 2011-05-23 14:10:26 -07:00
Adam Powell
f4232e0097 Change action button layout for split action bars 
Change-Id: Ie1427ae6b0334bf0a8afd5cae968c286c82a3837
 2011-05-23 13:35:25 -07:00
Glenn Kasten
bdd8a16282 Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead" 2011-05-23 09:06:03 -07:00
Steve Block
08d584cd1c Log a StrictMode violation when WebView methods are called on the wrong thread 
Bug: 4373919
Change-Id: I1f526e033ce316e51b3de7fe4ac88119fbc65b4e
 2011-05-23 14:45:02 +01:00
Robert Greenwalt
8508485871 am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp 
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
  Simplfy getActive* calls in ConnectivityService
 2011-05-21 21:35:38 -07:00
Jaikumar Ganesh
5710e72d91 am 69ed0b62: am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit '69ed0b628e18570f3fc7909fcdadc1e06f42e944':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-21 21:35:22 -07:00
Jaikumar Ganesh
35bfcbb9ab am e2271a55: am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit 'e2271a55ad67f766a6a47239d1a3f7319a1e7b2e':
  BT: Wrong publishing result of bonding error code.
 2011-05-21 21:35:16 -07:00
Jim Miller
4cded6e5ea am 940138de: am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2 
* commit '940138de9eae9be9ef60307af9e5f7a1168af533':
  Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
 2011-05-21 21:35:13 -07:00
Jim Miller
736c987340 am 7d75e772: am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit '7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-21 21:34:56 -07:00
Jeff Sharkey
eedcb9525b APIs to profile network usage for current UID. 
Added startDataProfiling() and stopDataProfiling() to TrafficStats,
which can be used by apps to measure network usage delta between two
points in time.  Currently takes two NetworkStats snapshots and returns
delta, which will eventually include tag-level granularity.  Added
tests for NetworkStats delta subtraction.

Added NMS.getNetworkStatsUidDetail() that returns stats for specific
UID.  Always gives stats access for the calling UID, otherwise enforces
that caller has permission.  Fix readSingleLongFromFile(), since
/proc/ files don't have well-defined lengths.

Change-Id: Ic5b6414d8effbd66846e275b00d4b8a82c74589d
 2011-05-21 15:02:58 -07:00
Adam Powell
f746fc9e45 Fix bug 4450805 - item selection dispatching in submenus. 
Change-Id: I6c56c9c8c6bd6c719250df4a21bda7d0ef463de4
 2011-05-20 19:47:16 -07:00
Fabrice Di Meglio
f32e0fe66f Merge "RTL Ordering of visual elements in LinearLayout" 2011-05-20 17:39:40 -07:00
Jim Miller
59a3319ffc am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '67cd389d4b9b6fd3ea0df8af57f58816d8005a4b':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-20 16:56:51 -07:00
Jim Miller
67cd389d4b am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-20 16:51:49 -07:00
Wink Saville
0ba625259e am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE 
* commit '2b534e770dadc4b3180863a393fd89094d0f07a7':
  Fix broken data retry
 2011-05-20 16:51:29 -07:00
Jim Miller
2c7906eb39 Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 2011-05-20 16:49:08 -07:00
Wink Saville
2b534e770d Merge "Fix broken data retry" into honeycomb-LTE 2011-05-20 16:47:54 -07:00
Fabrice Di Meglio
1e4cfbeba5 RTL Ordering of visual elements in LinearLayout 
- also update unit tests for testing LinearLayout

Change-Id: I0794d48c45a8fd4a899fdf6f6a1d05485b416e1a
 2011-05-20 16:23:36 -07:00
Adam Powell
7dfdb91420 am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit 'f483ed90401d63b7317f823fcac10315146d3072':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-20 16:14:42 -07:00
Wink Saville
61a5ab57b8 am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 
* commit 'f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4':
  Change getLteOnCdmaModeStatic to dynamically determine its result.
 2011-05-20 16:14:33 -07:00
Jim Miller
024e429b49 Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI 
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
 2011-05-20 16:14:15 -07:00
Dianne Hackborn
070a19e035 am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '5c8caba2e590792531ffb2c9f4ea924993662abd':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 16:13:54 -07:00
Adam Powell
f483ed9040 am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 
* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
 2011-05-20 16:02:21 -07:00
Adam Powell
bdc26dc34a Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2 2011-05-20 15:59:19 -07:00
Adam Powell
3f4a764cf4 Change measurement of effective screen height for PopupWindow now that 
DisplayMetrics reports it without system decorations.

Change-Id: I57f926de1cc7170b9996d7c71aa01542baf0c673
 2011-05-20 15:56:25 -07:00
Robert Greenwalt
5a6bec53e2 resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp 
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
 2011-05-20 15:45:55 -07:00
Glenn Kasten
850ae9acda Merge "Bug 4184736 unhide MediaPlayer.setTexture" 2011-05-20 15:42:31 -07:00
Kazuhiro Ondo
5ce6268faa Fix broken data retry 
Change I2b737efa6092ad1254c8dc25840ec429f5c6e882 brought side
effect that retry count is reset at every setup.

Change-Id: I6f20d2e82110b2873ff5acbb60a747fd11c09c60
 2011-05-20 15:31:33 -07:00
Wink Saville
f89ea7a5ec Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 2011-05-20 15:27:03 -07:00
Jaikumar Ganesh
69ed0b628e am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit 'd1735ef91af201ff140f8d954dd07eff80836d20':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:52:48 -07:00
Jaikumar Ganesh
e2271a55ad am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code." 
* commit 'd7030e551aa99ed9f533d46de5f3443ceb4c5703':
  BT: Wrong publishing result of bonding error code.
 2011-05-20 14:52:27 -07:00
The Android Open Source Project
cbc38e74f0 Reconcile with honeycomb-mr1-release 
Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95
 2011-05-20 14:36:37 -07:00
The Android Open Source Project
8c35086b97 Reconcile with honeycomb-release 
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
 2011-05-20 14:33:41 -07:00
Dianne Hackborn
5c8caba2e5 am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
  Add ParcelFileDescriptor.fromFd() and .adoptFd().
 2011-05-20 14:32:35 -07:00
Dianne Hackborn
1b144e625f Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2 2011-05-20 14:28:43 -07:00
Robert Greenwalt
dec3dda873 Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE 2011-05-20 14:25:29 -07:00
Jaikumar Ganesh
d1735ef91a am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 
* commit '4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
  Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
 2011-05-20 14:21:29 -07:00