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

92074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Lease
06e2a03a33 am 98ef010d: am aca6527e: am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit '98ef010daf522ab4e83dac6a03fe84c41e04aef1':
  fix crashing apps
 2012-10-15 15:57:05 -07:00
Victoria Lease
98ef010daf am aca6527e: am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit 'aca6527ed6d7b27ca80c0b8d8be8928df597a951':
  fix crashing apps
 2012-10-15 15:55:50 -07:00
Victoria Lease
aca6527ed6 am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit '3f840c8c3c1c53f046f6d187b2d3c4120b8d8afe':
  fix crashing apps
 2012-10-15 15:52:53 -07:00
Victoria Lease
3f840c8c3c Merge "fix crashing apps" into jb-mr1-dev 2012-10-15 15:50:00 -07:00
Victoria Lease
da479c5f8c fix crashing apps 
Bug: 7349330
Change-Id: Iea61bce23cb197c7a28d574098253823df73a99b
 2012-10-15 15:24:16 -07:00
Xavier Ducrohet
2d8d1513a8 am 50e137c7: am 136bd7c6: am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev 
* commit '50e137c7df4d9781f92a26afc1bdba1d817c703d':
  Fix SDK layout rendering in Eclipse.
 2012-10-15 15:21:12 -07:00
Xavier Ducrohet
50e137c7df am 136bd7c6: am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev 
* commit '136bd7c6aef8767dc208811ad87f90956333e78f':
  Fix SDK layout rendering in Eclipse.
 2012-10-15 15:19:50 -07:00
Xavier Ducrohet
136bd7c6ae am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev 
* commit '477687c1eb1919c54e2bffba2a740df3b4af6668':
  Fix SDK layout rendering in Eclipse.
 2012-10-15 15:17:46 -07:00
Xavier Ducrohet
477687c1eb Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev 2012-10-15 15:15:14 -07:00
Xavier Ducrohet
6dfd0b39a6 Fix SDK layout rendering in Eclipse. 
Change-Id: I0e9e85632012c0929b987ee9d0ccf7c25eece322
 2012-10-15 15:14:44 -07:00
Adam Cohen
a09580c025 am 6d016754: am 15ed1ba7: am 11dea4d7: Merge "Fix issue where pin field doesn\'t have focus (issue 7348937)" into jb-mr1-dev 
* commit '6d016754f6e496ea879852aca01dbb40c88b1ac0':
  Fix issue where pin field doesn't have focus (issue 7348937)
 2012-10-15 14:48:30 -07:00
Adam Cohen
6d016754f6 am 15ed1ba7: am 11dea4d7: Merge "Fix issue where pin field doesn\'t have focus (issue 7348937)" into jb-mr1-dev 
* commit '15ed1ba7c3de6ec4a9d48d4b07c2e277d3cd5cc7':
  Fix issue where pin field doesn't have focus (issue 7348937)
 2012-10-15 14:45:53 -07:00
Adam Cohen
15ed1ba7c3 am 11dea4d7: Merge "Fix issue where pin field doesn\'t have focus (issue 7348937)" into jb-mr1-dev 
* commit '11dea4d710138c27b2430f171aee48bb2b9e7381':
  Fix issue where pin field doesn't have focus (issue 7348937)
 2012-10-15 14:44:20 -07:00
Adam Cohen
11dea4d710 Merge "Fix issue where pin field doesn't have focus (issue 7348937)" into jb-mr1-dev 2012-10-15 14:41:26 -07:00
Romain Guy
5dc228d234 am a97a9bef: am 807e4375: am f2e28abb: Merge "Update javadoc" into jb-mr1-dev 
* commit 'a97a9beff7e3c66ca41a6e2029433bc9f1f390ba':
  Update javadoc
 2012-10-15 14:26:15 -07:00
Romain Guy
a97a9beff7 am 807e4375: am f2e28abb: Merge "Update javadoc" into jb-mr1-dev 
* commit '807e4375e970741fdc9f8315e4a7ba29b4d7549b':
  Update javadoc
 2012-10-15 14:23:48 -07:00
Romain Guy
807e4375e9 am f2e28abb: Merge "Update javadoc" into jb-mr1-dev 
* commit 'f2e28abb1375c5ca513eac9dcde5c349f771de0f':
  Update javadoc
 2012-10-15 14:22:20 -07:00
Romain Guy
f2e28abb13 Merge "Update javadoc" into jb-mr1-dev 2012-10-15 14:19:29 -07:00
Adam Cohen
ac8a59d3d3 Fix issue where pin field doesn't have focus (issue 7348937) 
Change-Id: Ia926765271251248701416c001e2e73131cdf4ad
 2012-10-15 14:12:55 -07:00
Jeff Sharkey
227f782b4f am 288c3280: am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit '288c32805bec0c376c111bd9851b677c00e78afd':
  Protect more service dump() methods.
 2012-10-15 14:08:45 -07:00
Jeff Sharkey
288c32805b am ec8d1280: am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit 'ec8d1280ac70245dcc533054b748f794f33f85bd':
  Protect more service dump() methods.
 2012-10-15 14:06:09 -07:00
Jeff Sharkey
ec8d1280ac am 532c9c45: Merge "Protect more service dump() methods." into jb-mr1-dev 
* commit '532c9c4543135463ee1f39b282d3156a3e226d50':
  Protect more service dump() methods.
 2012-10-15 14:03:53 -07:00
Jeff Sharkey
532c9c4543 Merge "Protect more service dump() methods." into jb-mr1-dev 2012-10-15 14:01:57 -07:00
Romain Guy
edc9005289 Update javadoc 
Some View.post*() methods can be invoked from arbitrary thread
independently of whether the View is attached to a window.

Change-Id: I587b5909ab8b06665978d001548d56c8c22043c1
 2012-10-15 12:31:57 -07:00
Robert Greenwalt
f782833244 am af614e7d: am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit 'af614e7d3c28409cd1a9e53b3e6b5d6bc524f40f':
  Monitor the right interface re VPN
 2012-10-15 11:40:40 -07:00
Robert Greenwalt
af614e7d3c am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit '4e579b5ac23fc2eda314fb43600c83ebc3eb2cd0':
  Monitor the right interface re VPN
 2012-10-15 11:38:41 -07:00
Robert Greenwalt
4e579b5ac2 am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev 
* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
  Monitor the right interface re VPN
 2012-10-15 11:37:13 -07:00
Robert Greenwalt
a30d969401 Merge "Monitor the right interface re VPN" into jb-mr1-dev 2012-10-15 11:34:13 -07:00
Jeff Sharkey
52801aae89 Protect more service dump() methods. 
Bug: 6406965
Change-Id: Ia45a580c1e6f403308e7e540f18f2c0505af0f29
 2012-10-15 10:59:51 -07:00
Irfan Sheriff
9becdadb7f am 04353e81: am 7e08477e: am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev 
* commit '04353e81e68ad6f217dda6d30d297926337f079f':
  Fix handling of lost device
 2012-10-15 10:29:59 -07:00
Irfan Sheriff
04353e81e6 am 7e08477e: am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev 
* commit '7e08477ed1589bc7d6488c8bacbdfb407fda20f0':
  Fix handling of lost device
 2012-10-15 10:27:54 -07:00
Irfan Sheriff
7e08477ed1 am d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev 
* commit 'd86a532c5271dfbfe7378ddeb6700fafd92ecbcc':
  Fix handling of lost device
 2012-10-15 10:25:23 -07:00
Irfan Sheriff
d86a532c52 Merge "Fix handling of lost device" into jb-mr1-dev 2012-10-15 10:23:23 -07:00
Marco Nelissen
87f6cbcdd7 am ac47033f: am 6133e92e: am 48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev 
* commit 'ac47033ff4040a3695362f5f07a645b5f853eb72':
  Rewind buffer before copying into it.
 2012-10-15 10:07:45 -07:00
Marco Nelissen
ac47033ff4 am 6133e92e: am 48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev 
* commit '6133e92e6bd6557f5b1324e515b35fd8e6a9cd54':
  Rewind buffer before copying into it.
 2012-10-15 10:04:54 -07:00
Marco Nelissen
6133e92e6b am 48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev 
* commit '48df14919602a7aac9ea9d0f0a2a3afe04eb6e0b':
  Rewind buffer before copying into it.
 2012-10-15 10:02:59 -07:00
Marco Nelissen
48df149196 Merge "Rewind buffer before copying into it." into jb-mr1-dev 2012-10-15 10:00:16 -07:00
Chris Wren
70dbc7d919 am 33856c19: am 5d0a560c: am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 
* commit '33856c19dfa9a527b076f467e68b0c6f575d998b':
  delay onDreamingStarted() to work around asynchrony.
 2012-10-15 09:12:35 -07:00
Chris Wren
33856c19df am 5d0a560c: am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 
* commit '5d0a560ca4e455bfe8f77c2872a479e210b38dcf':
  delay onDreamingStarted() to work around asynchrony.
 2012-10-15 09:10:21 -07:00
Chris Wren
5d0a560ca4 am 4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 
* commit '4a01f2b5dcb5bcb72358905db402731013195cfd':
  delay onDreamingStarted() to work around asynchrony.
 2012-10-15 09:08:17 -07:00
Chris Wren
4a01f2b5dc Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev 2012-10-15 09:06:37 -07:00
The Android Open Source Project
272707a2da am 0239d208: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '0239d208808194991b223b10823a62a0d91c94f3':
 2012-10-15 07:42:54 -07:00
The Android Open Source Project
0239d20880 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I8cfdea0a54b2a687eff159f9e5cd7706ccdb290e
 2012-10-15 07:38:41 -07:00
The Android Automerger
6cf2a24ece merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-15 06:59:20 -07:00
Fergus Henderson
3794a3cad8 Merge "SynthesisCallback documentation update" 2012-10-15 05:18:06 -07:00
Przemyslaw Szczepaniak
a6e16b86b9 SynthesisCallback documentation update 
Clarification about when android.speech.tts.SynthesisCallback.done()
should be called.

Bug: 2481825
Change-Id: Ic781a6facc2d9acb3f06afb952fbac0b494c56cf
 2012-10-15 13:07:11 +01:00
Jim Miller
41d7372a72 am c866b801: am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit 'c866b8013a6dd5e7c95f8a197170904f753033ea':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:35:31 -07:00
Jim Miller
c866b8013a am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit '1deaf3c710c54a23ace35e1f5c1718591133b681':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:32:48 -07:00
Jim Miller
1deaf3c710 am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit '87d57952af662a94637c1519b2189e22456af2db':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:31:04 -07:00
Jim Miller
87d57952af Minor layout tweaks and bug fix in keyguard 
- fix wrong string in SIM PUK unlock
- use buttonBar style for "emergency" and "forgot pattern" buttons

Bug 7341237

Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
 2012-10-15 02:10:57 -07:00