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

51221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
54802de06c Make sure all references to the decoder plugin are accounted for 
before calling dlunload().

Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de
related-to-bug: 4466387
 2011-05-24 15:15:42 -07:00
Andreas Huber
60a3cb81c0 Make sure the software mpeg4 decoder supports multiple input frames per input buffer 
to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
 2011-05-24 14:53:30 -07:00
James Dong
2646219aaa resolved conflicts for merge of d5762583 to master 
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
 2011-05-24 08:04:45 -07:00
Xavier Ducrohet
9dd85837e3 am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '46e802e9c12befcd477e59437c5de3f0889aef4e':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-24 02:57:37 -07:00
Xavier Ducrohet
1ff04d8e56 am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'ea182704b60551a9bd7760aa9d206ca7a7e407b8':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-24 02:57:31 -07:00
Xavier Ducrohet
690a9bb8ad am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit '162dd490cd0b502c717db59300b3fd902f76710a':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-24 02:57:11 -07:00
Kazuhiro Ondo
3dbc571e62 am 6056e326: am f96a6150: Data reconnection issue after airplane mode 
* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
  Data reconnection issue after airplane mode
 2011-05-24 02:56:15 -07:00
Kazuhiro Ondo
eb1fbf7a45 am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links 
* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
  GSM DCT: Update poll stats to support multi-links
 2011-05-24 02:56:08 -07:00
Wink Saville
cb3fad5cbe am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change 
* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
  Tear down connection with unwanted linkproperty change
 2011-05-24 02:38:17 -07:00
Wink Saville
d24c1dfe2b am f7bc0e28: am 16e8d22b: Fix build. 
* commit 'f7bc0e28bf66c20ef233a161cd1d50a009013ab0':
  Fix build.
 2011-05-24 00:39:54 -07:00
Wink Saville
2879343291 Fix build. 
A merge accidentally included a line that was deleted.

Change-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989
 2011-05-23 21:56:11 -07:00
Wink Saville
595881ee5e am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE 
* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
  Notify RIL that PDP reset is triggered due to data stall
 2011-05-23 20:49:05 -07:00
John Wang
5ea7a29387 am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE 
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
  Add UI to handle SIM swap.
 2011-05-23 20:48:57 -07:00
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
James Dong
d5762583bd am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 10:26:40 -07:00
Xavier Ducrohet
46e802e9c1 am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-23 10:22:00 -07:00
Xavier Ducrohet
ea182704b6 am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-23 10:21:57 -07:00
Xavier Ducrohet
162dd490cd am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit '9d9a7466cd051748ba656acd39265099294c4153':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-23 10:21:49 -07:00
James Dong
ebae192386 am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 09:59:59 -07:00
Xavier Ducrohet
5b9ec6871a am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. 
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
  Merge e57aa434 from honeycomb-mr1. do not merge.
 2011-05-23 09:52:55 -07:00
Xavier Ducrohet
041fd74bea am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread 
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
  Merge 05b7b69c from honeycomb-mr1. do not merge.
 2011-05-23 09:52:52 -07:00
Xavier Ducrohet
9d9a7466cd am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread 
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
  Merge 2fae858d from Honeycomb-mr1. do not merge.
 2011-05-23 09:52:41 -07:00
James Dong
a5293d1ca4 Add some logging to track down where ANR happens during MediaPlayer._release(). 
o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
 2011-05-23 09:36:31 -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
Kazuhiro Ondo
6056e3268a am f96a6150: Data reconnection issue after airplane mode 
* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
  Data reconnection issue after airplane mode
 2011-05-21 13:02:17 -07:00
Kazuhiro Ondo
8e1f6eceb3 am 4c88be65: GSM DCT: Update poll stats to support multi-links 
* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
  GSM DCT: Update poll stats to support multi-links
 2011-05-21 12:50:18 -07:00
Kazuhiro Ondo
f96a6150e4 Data reconnection issue after airplane mode 
ApnContext and DC were not disassociated when force
"cleanUpConnection" was called. Causing the setup
request was not happening if applyNewStatus() was
the trigger.

Change-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa
 2011-05-21 12:49:41 -07:00
Kazuhiro Ondo
4c88be655e GSM DCT: Update poll stats to support multi-links 
Change-Id: I654e38e71f9576ed2c4da59af563be04bc87045c
 2011-05-21 11:57:41 -07:00
Wink Saville
7abbf93c85 am 15cd6ec2: Tear down connection with unwanted linkproperty change 
* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
  Tear down connection with unwanted linkproperty change
 2011-05-21 11:13:07 -07:00