summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* Extracted a separate class to run dexopt on packagesFyodor Kupolov2015-03-112-0/+14
* am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"Andreas Gampe2015-03-071-4/+1
|\
| * Frameworks/base: Remove unnecessary Pattern instanceAndreas Gampe2015-03-071-4/+1
* | am 6e208cdd: Merge "Remove wrong javadoc comment"Narayan Kamath2015-02-241-3/+1
|\ \ | |/
| * Merge "Remove wrong javadoc comment"Narayan Kamath2015-02-241-3/+1
| |\
| | * Remove wrong javadoc commentRomain Vimont2014-07-081-3/+1
* | | resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aospAlex Klyubin2015-02-113-41/+69
|\ \ \ | |/ /
| * | Move hidden ApplicationInfo flags into a separate field.Alex Klyubin2015-02-113-41/+69
* | | am a6318cd7: am d09878c1: am 61333d1b: Merge "Limit cache update to packages ...Amith Yamasani2015-02-091-9/+43
|\ \ \
| * | | Limit cache update to packages that have changedAmith Yamasani2015-02-091-9/+43
* | | | am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for me...Ricardo Cervera2015-01-161-0/+4
|\ \ \ \ | |/ / /
| * | | am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-0/+4
| |\ \ \
| | * \ \ am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-0/+4
| | |\ \ \
| | | * \ \ resolved conflicts for merge of e8f6bd48 to lmp-devRicardo Cervera2015-01-161-0/+4
| | | |\ \ \
| | | | * \ \ am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(...Ricardo Cervera2015-01-161-0/+4
| | | | |\ \ \
| | | | | * \ \ am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256Ricardo Cervera2015-01-161-0/+4
| | | | | |\ \ \
| | | | | | * | | docs: Added info on noHistory and onActivityResult(). Bug: 13807256Ricardo Cervera2014-11-051-0/+4
* | | | | | | | | am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stat...Dianne Hackborn2015-01-151-3/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix issue android-app doc, bump battery stats checkin versionDianne Hackborn2015-01-141-3/+5
* | | | | | | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei...Olawale Ogunwale2015-01-121-4/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | [ActivityManager] Distinguish FG or BG receiver finishedriddle_hsu2015-01-031-4/+6
* | | | | | | | | am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceN...Michael Wright2014-12-301-0/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add MEDIA_PROJECTION_SERVICE to the ServiceName list.Michael Wright2014-12-231-0/+1
* | | | | | | | | am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-devJay Shrauner2014-12-161-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix NPE in Transport.applyBatchJay Shrauner2014-12-151-4/+6
* | | | | | | | | am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTe...Dianne Hackborn2014-12-101-9/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...Dianne Hackborn2014-12-091-9/+14
* | | | | | | | | am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ...Eino-Ville Talvala2014-12-041-20/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Revert "Camera: Add new capability flags as system features as well"" ...Eino-Ville Talvala2014-12-031-20/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Camera: Add new capability flags as system features as well"Eino-Ville Talvala2014-12-031-20/+0
* | | | | | | | | | am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and p...Dianne Hackborn2014-12-041-0/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix issue #17948584: Application crash and phone restart when app..." ...Dianne Hackborn2014-12-031-0/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix issue #17948584: Application crash and phone restart when app...Dianne Hackborn2014-12-031-0/+4
* | | | | | | | | | am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, upd...Alan Viverette2014-12-021-0/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Deprecate one-arg getDrawableForDensity, update currents.txtAlan Viverette2014-12-021-0/+4
* | | | | | | | | | am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favo...Alan Viverette2014-12-021-0/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Deprecate Resources.getDrawable(int) in favor of the two-arg versionAlan Viverette2014-12-021-0/+4
| |/ / / / / / / /
* | | | | | | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-021-1/+15
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-021-1/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | RRO: reintroduce lost ResTable insert of assetsMÃ¥rten Kongstad2014-11-071-1/+15
* | | | | | | | | | am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageS...Adam Lesinski2014-11-251-2/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Make the Context service constant for UsageStats public" into lmp-mr1-devAdam Lesinski2014-11-251-2/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make the Context service constant for UsageStats publicAdam Lesinski2014-11-241-2/+1
* | | | | | | | | | | am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDra...Alan Viverette2014-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-devAlan Viverette2014-11-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Check for null drawable in theme-less getDrawable()Alan Viverette2014-11-241-1/+1
* | | | | | | | | | | am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." in...Jeff Sharkey2014-11-253-18/+79
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Introduce revision codes for split APKs.Jeff Sharkey2014-11-243-18/+79
* | | | | | | | | | | am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager AP...Wink Saville2014-11-241-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Additional changes to SubscriptionManager API as per API council." int...Wink Saville2014-11-221-0/+12
| |\ \ \ \ \ \ \ \ \ \