summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am d43a71da: Merge "Help for the debugging help for issue #8734824." into ↵Dianne Hackborn2013-05-065-3/+100
|\ | | | | | | | | | | | | jb-mr2-dev * commit 'd43a71dad80dfca65b0758f4333360516f6ad300': Help for the debugging help for issue #8734824.
| * Merge "Help for the debugging help for issue #8734824." into jb-mr2-devDianne Hackborn2013-05-065-3/+100
| |\
| | * Help for the debugging help for issue #8734824.Dianne Hackborn2013-05-065-3/+100
| | | | | | | | | | | | | | | | | | | | | Add a new "hang" am command that lets you hang the system process. Useful for testing. Change-Id: Ice0fc52b49d80e5189f016108b03f9fd549b58a7
* | | am 06548798: am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am ↵Christopher Tate2013-05-060-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore * commit '06548798f5b03b552d27e956da094effb70ee570': Ensure install-during-restore is like install-then-restore
| * | am 2ad68f7d: am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am ↵Christopher Tate2013-05-060-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore * commit '2ad68f7d261a1dbc749f6e322b1e84a1288087bd': Ensure install-during-restore is like install-then-restore
| | * \ am 04d61410: am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am ↵Christopher Tate2013-05-061-1/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like install-then-restore * commit '04d6141033c66a1777ba0c66d67a7540e4c3e89c': Ensure install-during-restore is like install-then-restore
| | | * \ am dfb33b86: am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am ↵Christopher Tate2013-05-061-1/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81c1d8d3: Ensure install-during-restore is like install-then-restore * commit 'dfb33b860f0c936d8af6555835da0ef1aea6c870': Ensure install-during-restore is like install-then-restore
| | | | * \ am fcfc99c0: am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure ↵Christopher Tate2013-05-061-1/+10
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-during-restore is like install-then-restore * commit 'fcfc99c064f0b91fa419784bd90bb9944b9ab9f4': Ensure install-during-restore is like install-then-restore
| | | | | * \ am f7918b4a: am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure ↵Christopher Tate2013-05-061-1/+10
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-during-restore is like install-then-restore * commit 'f7918b4a1e06350ba4d69fe47327db830cd4e8ba': Ensure install-during-restore is like install-then-restore
| | | | | | * \ am d3a57029: am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-then-restore * commit 'd3a57029e80073aa3c7dfe1dbc8945d32968f6ae': Ensure install-during-restore is like install-then-restore
| | | | | | | * \ am 1b0c9c95: am 81c1d8d3: Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-then-restore * commit '1b0c9c95dc72ebeb8af73bc3ff44c313ebd788f4': Ensure install-during-restore is like install-then-restore
| | | | | | | | * \ am 81c1d8d3: Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df': Ensure install-during-restore is like install-then-restore
| | | | | | | | | * | Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we've installed an apk from the archive, recheck whether to apply the system-uid policy restrictions around file system restores. Bug 8833099 (cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39) Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
* | | | | | | | | | | am cd1de394: Merge "Track change in NativeCrypto"Kenny Root2013-05-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd1de3940d9c389b6e69a7040c67d3abb8458ad2': Track change in NativeCrypto
| * \ \ \ \ \ \ \ \ \ \ Merge "Track change in NativeCrypto"Kenny Root2013-05-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Track change in NativeCryptoKenny Root2013-05-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic04d4ac5218795fc226f1751b6ae4db1ae73a930
* | | | | | | | | | | | | am e242c731: Merge "Ensure install-during-restore is like ↵Christopher Tate2013-05-061-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | install-then-restore" into jb-mr2-dev * commit 'e242c731f2288a615d54f329cdeb16157d4c15ea': Ensure install-during-restore is like install-then-restore
| * | | | | | | | | | | | Merge "Ensure install-during-restore is like install-then-restore" into ↵Christopher Tate2013-05-061-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | * | | | | | | | | | | Ensure install-during-restore is like install-then-restoreChristopher Tate2013-05-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we've installed an apk from the archive, recheck whether to apply the system-uid policy restrictions around file system restores. Bug 8833099 Change-Id: Ifa1b5877673a0d6ca6acf94e60f314fd0dda008c
* | | | | | | | | | | | | am 601afaef: Merge "Someone\'s IDE chose the wrong Date."Elliott Hughes2013-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '601afaef5220aef928a9235e50376c462538a942': Someone's IDE chose the wrong Date.
| * | | | | | | | | | | | Merge "Someone's IDE chose the wrong Date."Elliott Hughes2013-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Someone's IDE chose the wrong Date.Elliott Hughes2013-05-061-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part 1 of the mystery of the java.sql.Date in preloaded-classes solved. Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
* | | | | | | | | | | | am 5b88a2fd: Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESSDianne Hackborn2013-05-065-2/+85
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5b88a2fd7b77880f6e09ae4a1de509bebe28bc3a': Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESS
| * | | | | | | | | | | Debugging help for issue #8734824: WATCHDOG KILLING SYSTEM PROCESSDianne Hackborn2013-05-065-2/+85
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IActivityController has a new callback which the Watchdog calls when it detects that the system process is hung. This may be use full monkey. All hail the monkey! Also add a new private feature to Binder to be able to turn off all incoming dump() calls to a process. The watchdog uses this when it reports it is hung, so that if someone, say, wants to collect a bug report at this point they won't get stuck waiting for things that are all busted. Change-Id: Ib514d97451cf3b93f29e194c1954e29f948c13b1
* | | | | | | | | | | am 996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-063-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '996f6b048ba03ca727c40e1bc33100bf45c93518': Import translations. DO NOT MERGE
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-063-5/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-063-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibceb0c93f3886cc191b9cd7d2fe026fb0d39c5da Auto-generated-cl: translation import
* | | | | | | | | | | | am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-devRobert Greenwalt2013-05-061-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '341666c40d222145f7dfd44bdbed48590c4dc5da': Fix sync problem in NsdManager
| * | | | | | | | | | | Merge "Fix sync problem in NsdManager" into jb-mr2-devRobert Greenwalt2013-05-061-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix sync problem in NsdManagerRobert Greenwalt2013-05-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NsdManager init was thinking it was done before the AsyncChannel was fully setup and if the setup were slow and the app fast, the app could make calls to the NsdManager that it wasn't ready for. bug:8545006 Change-Id: I2cb2a7c0a1c7f3d2b81ac0f66d37346e6d2d720d
* | | | | | | | | | | | am 72f2a7af: Merge "Fix bug where thumbnails in Recents disappear" into ↵Michael Jurka2013-05-062-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '72f2a7af828056fc426d936c1d40cb6bbdbdf7c7': Fix bug where thumbnails in Recents disappear
| * | | | | | | | | | | Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-devMichael Jurka2013-05-062-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix bug where thumbnails in Recents disappearMichael Jurka2013-05-022-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7900353 Bug: 8752242 Bug: 7382208
* | | | | | | | | | | | | am 236cc476: Temporarily revert field name change (DO NOT MERGE)Dave Burke2013-05-063-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '236cc476e6792a11502ba4f40c7ab4586f40d282': Temporarily revert field name change (DO NOT MERGE)
| * | | | | | | | | | | | Temporarily revert field name change (DO NOT MERGE)Dave Burke2013-05-063-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VisualOn is using hidden fields, causing HBO and Xfinity to crash. Bug: 8549617 Bug: 8331866 Change-Id: I35a9fe66dea8d56f4fcff9b492679226a17f4acc
* | | | | | | | | | | | | am 96f69cbe: am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am ↵Dirk Dougherty2013-05-065-9/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3a7ea42: Doc change: Update landing pages for Google Play Services. * commit '96f69cbec3112e87e9d7bc451bf142a6e6918113': Doc change: Update landing pages for Google Play Services.
| * | | | | | | | | | | | am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: ↵Dirk Dougherty2013-05-045-9/+171
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update landing pages for Google Play Services. * commit '20860a3f8b6a37719fc59fce1b1267b92efef5a3': Doc change: Update landing pages for Google Play Services.
| | * | | | | | | | | | | am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update ↵Dirk Dougherty2013-05-045-9/+171
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landing pages for Google Play Services. * commit '79ebe80a85ce97e3278f51e11086a2b89e09f86d': Doc change: Update landing pages for Google Play Services.
| | | * | | | | | | | | | am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for ↵Dirk Dougherty2013-05-045-9/+171
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Play Services. * commit 'e34ecc9a06f4a626cc78c648e621c4b7bb4a1242': Doc change: Update landing pages for Google Play Services.
| | | | * | | | | | | | | am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play ↵Dirk Dougherty2013-05-045-9/+171
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Services. * commit '3dbb173e8d9ae7893a10a76b1b7fed66f1adb25b': Doc change: Update landing pages for Google Play Services.
| | | | | * | | | | | | | am c3a7ea42: Doc change: Update landing pages for Google Play Services.Dirk Dougherty2013-05-045-9/+171
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3a7ea424d96aac02762ab6819429e3fa52d9a25': Doc change: Update landing pages for Google Play Services.
| | | | | | * | | | | | | Doc change: Update landing pages for Google Play Services.Dirk Dougherty2013-05-035-9/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
* | | | | | | | | | | | | am 02b7128f: Merge "Add android.opengl.EGLExt class for EGL extensions" into ↵Jesse Hall2013-05-065-26/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '02b7128f87ce55693cb6401ab09a5e47b5db5cb5': Add android.opengl.EGLExt class for EGL extensions
| * | | | | | | | | | | | Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-devJesse Hall2013-05-045-26/+217
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add android.opengl.EGLExt class for EGL extensionsJesse Hall2013-05-015-26/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ES-relevant constants from the EGL_KHR_create_context extension. These allow apps to check which EGLConfigs (if any) support ES3 contexts. Otherwise, the app has to create a context with an EGLConfig and then check whether it is an ES2 or ES3 context. Also move eglSetPresentationTimeANDROID from EGL14 to EGLExt, since it's an extension function. It's new in API 18. Bug: 8678160 Change-Id: I3cba6e59ebb0a3a4c4012aa54a36b940c288bcec
* | | | | | | | | | | | | | am fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" ↵Romain Guy2013-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'fdf13c90cb6b412dd93ae6a8990bf962e0d71407': Convert alpha from [0..1] to [0.255] range Bug #8808886
| * | | | | | | | | | | | | Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" into jb-mr2-devRomain Guy2013-05-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Convert alpha from [0..1] to [0.255] rangeRomain Guy2013-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #8808886 Without this conversion, alpha was always set to 0 or 1 which causes things to disappear mysteriously. Mysteries are meant to be solved and I solved them all in 6 characters. Change-Id: I2078420fbe968c046e999b0eabb24403e71108fd
* | | | | | | | | | | | | | | am d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-devChet Haase2013-05-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd65eebf4d97dd3812f02e7755e5b399c27e49f71': Fix scaled-view droppings artifact
| * | | | | | | | | | | | | | Merge "Fix scaled-view droppings artifact" into jb-mr2-devChet Haase2013-05-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-11 01:20:57 +0000