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

51283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
b5b1fb2585 Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-05-24 14:26:18 -07:00
Jason parks
e372c17ba7 Merge "Add public API to do NDEF push." 2011-05-24 13:49:51 -07:00
Jason parks
01425365a8 Add public API to do NDEF push. 
Change-Id: I102da9bbc6d78577a26fa03ee363a60abc389d6c
 2011-05-24 15:22:07 -05:00
Jeffrey Tinker
4b4e3a0b21 am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'c41a17de2b2e80f246adeef4962073916dcfff0b':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-24 12:57:22 -07:00
Mike Lockwood
7cc9ee2676 am 859443f2: am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '859443f2a4d6a2b72c3e9c75720d32d4e4c09489':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-24 12:57:17 -07:00
Amith Yamasani
942bc252ce am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-24 12:57:08 -07:00
Mike Lockwood
9fd4c6d3ae am 49b9449b: am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 
* commit '49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47':
  MountService: Add StorageVolume as extra in storage related broadcasts.
 2011-05-24 12:56:56 -07:00
John Reck
aa9fff8cb4 am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit 'f656d95078fbcb65df7753ba8c04679c5389e15c':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-24 12:56:32 -07:00
Dianne Hackborn
c42b791b74 Merge "resolved conflicts for merge of bbca8133 to master" 2011-05-24 12:44:07 -07:00
Jeff Brown
ebed7d6e35 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
 2011-05-24 12:01:25 -07:00
RoboErik
43175dde74 Merge "Add original_id definition for cal db v301" 2011-05-24 11:34:45 -07:00
Dianne Hackborn
e2c7715c77 resolved conflicts for merge of bbca8133 to master 
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
 2011-05-24 11:27:11 -07:00
Steve Block
20ce4a49af Merge "In DRT2, correctly handle the case of zero tests" 2011-05-24 10:55:17 -07:00
Steve Block
9eed25e257 In DRT2, correctly handle the case of zero tests 
Bug: 3291382
Change-Id: I8cde1d8d78a57407c585b02ca8ba3f3f893a609b
 2011-05-24 18:54:14 +01:00
Steve Block
ee864481e9 Merge changes Ibe495cdc,I6f8e5745 
* changes:
  Update DRT2 to reflect WebKit code movement
  Add extra error handling to DRT2 launcher script
 2011-05-24 10:48:21 -07:00
Steve Block
183c3c9ca2 Update DRT2 to reflect WebKit code movement 
See http://trac.webkit.org/changeset/74301

Change-Id: Ibe495cdc1f50f65db5663dbb63af9b9c2db050d0
 2011-05-24 18:46:35 +01:00
Steve Block
31e446c3db Add extra error handling to DRT2 launcher script 
Bug: 3291220
Change-Id: I6f8e57458cd4334a998eb256af303ffcd9c50d64
 2011-05-24 18:46:34 +01:00
Gilles Debunne
970ce73017 Merge "Made getOffsetForPosition public in TextView." 2011-05-24 09:26:44 -07:00
Gilles Debunne
bd4d582622 Merge "TextView uses floats for touch event positions." 2011-05-24 09:26:14 -07:00
Gilles Debunne
7a4adca1cb Merge "Added a new flag in TextView to disable Suggestions." 2011-05-24 09:25:52 -07:00
TK MUN
6895c49943 am 98a8231e: (-s ours) am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received 
* commit '98a8231e838d7d624c5862d81d1975ef4f8d0d57':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
 2011-05-24 08:44:12 -07:00
Wink Saville
fb9eebc427 am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 
* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
  Map multiple apnType to one DataConnection fixes.
 2011-05-24 08:42:10 -07:00
Wink Saville
9a4285474c am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 
* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
  Data Connection: Use Alarm for all delayed data retries.
 2011-05-24 08:42:05 -07:00
Shimeng (Simon) Wang
5b0724d6cf am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer. 
* commit 'f55a00b1b86c58d78a4c2812d00e1b61d03f520a':
  Simplify browser pause/resume logic to avoid stuck timer.
 2011-05-24 08:41:37 -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
Gilles Debunne
9511b41e05 Made getOffsetForPosition public in TextView. 
Bug 4443839

Change-Id: I3e5d6f0fe3a45b068166f682daf3c4163903306e
 2011-05-23 18:48:26 -07:00
Jeffrey Tinker
c41a17de2b am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:47:17 -07:00
Jeff Sharkey
348a48fc70 Merge "Observe screen on/off events in NetworkPolicy." 2011-05-23 18:47:11 -07:00
Mike Lockwood
859443f2a4 am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit 'c0d9834a1c6dd8d9cd0b7fe9b50495578c104405':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:45:17 -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
Gilles Debunne
3bca69b09f TextView uses floats for touch event positions. 
This is the type returned by event.getX/Y methods. Conversion
to ints is only performed when needed. Low performance impact
since there is only a minimal amount of computations on these
values.

Change-Id: I53a56efe5e3a1a96911adc25fedaab7f40f1ba8e
 2011-05-23 18:20:26 -07:00
Jeffrey Tinker
6e5cdca12b am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'ef89cc14957ab631346564801841190346632ac9':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:15:47 -07:00
Jeffrey Tinker
ef89cc1495 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Mike Lockwood
c0d9834a1c am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '5d78e0b8ea548da3fa88ae2190a9334297b992b6':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-23 18:04:44 -07:00