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

166078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
f769c98172 am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '4d9872e6ecc221d3c8bbd66b8efee819d12dbb90':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:49:03 +00:00
kmccormick
20dfe399a6 am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '63ee197682bf7cf831950087028b2a81902f92c9':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:48:53 +00:00
kmccormick
4d9872e6ec am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '1649712f8745f6b62e453b8b4a230374308732ce':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:26:18 +00:00
kmccormick
1649712f87 am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
* commit '13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
  DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:20:34 +00:00
kmccormick
63ee197682 am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:19:46 +00:00
Adam Lesinski
496611416d am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '720a5c51beb5beab442832ea8d169aa5b4edb43f':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-29 23:15:33 +00:00
kmccormick
2b20b9d23a am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:12:52 +00:00
Adam Lesinski
720a5c51be Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 2014-10-29 23:11:54 +00:00
Wale Ogunwale
0319e704c1 am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 
* commit 'a232953ea3f7eedfdd4dd7b58b63886433dbdd56':
  Fix issue 6455374: Bad recent image on camera launch from lockscreen.
 2014-10-29 23:11:10 +00:00
Eric Laurent
96c39e4c89 am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 
* commit 'c0c1255a930bf0c2104f82c05f430b34112cc1bf':
  SoundTrigger JNI: fix local reference leak.
 2014-10-29 23:11:05 +00:00
kmccormick
3e92c4a20f am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-29 23:09:23 +00:00
Wale Ogunwale
a232953ea3 Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 2014-10-29 23:08:21 +00:00
Eric Laurent
c0c1255a93 Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev 2014-10-29 23:07:33 +00:00
kmccormick
13d7ea464e DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes. 
Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

Fix for:
b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
 2014-10-29 23:06:46 +00:00
kmccormick
1867f2cfdd Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 2014-10-29 23:04:29 +00:00
Santos Cordon
1742413b9b Even more javadocs for telecom. 
Bug: 18142177
Change-Id: I4eefe422ec66bb9e14fd8a3b1ee2cb24fedbff51
 2014-10-29 15:59:50 -07:00
Alan Viverette
0ab3e1df1d am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev 
* commit '4e7c562c43e9014c8fb3e75d02ba98fa4edadbde':
  Update drawable state after updating tint list
 2014-10-29 22:56:07 +00:00
Svetoslav
39f35336e5 am d3786a59: Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev 
* commit 'd3786a5931cde3f76dc5cd702d3ba246246fdf47':
  Print preview disappearing if printer is changed.
 2014-10-29 22:56:02 +00:00
Alan Viverette
baed009eae am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev 
* commit '2d3443fc5a6cf0830edd6a498a87760143dbc570':
  Add setters for window elevation and clipToOutline properties
 2014-10-29 22:55:57 +00:00
Alan Viverette
9b5a4e9daf am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev 
* commit '66c0adcfd4351518512df2f3e81526d2d67d6d65':
  Ensure accessibility focus rect is drawn correctly
 2014-10-29 22:55:53 +00:00
Alan Viverette
19b1c26622 am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev 
* commit '8785a56c8f35863b7f02769b6021fba7000f6403':
  Create translucent hardware renderer if surface insets are non-zero
 2014-10-29 22:55:47 +00:00
Dianne Hackborn
8f53ad8e73 am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev 
* commit '7ef463168c9ba08548858df086934b125c1ff57c':
  Condense AndroidRuntime init log, include uid running under.
 2014-10-29 22:55:42 +00:00
Tom Taylor
b281c06834 am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev 
* commit 'de48e8809ec5bd208ca032824c0fe607ed57af1d':
  Add a missing mms_config constant to SmsManager
 2014-10-29 22:55:37 +00:00
Jeff Hao
73577862ff am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit 'b1346d7829b83bcd813bc73506525822f4148429':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-29 22:55:29 +00:00
Tyler Gunn
7577f3dd8b am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev 
* commit '167230987b3224c30f2ecefa90a83fc19d449cf9':
  Communicating participant changes to conference controller.
 2014-10-29 22:55:20 +00:00
Alan Viverette
b2449a399b am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 
* commit 'd86d7bce78a5f6e70bdac8f6d4bb1a968d440128':
  Use action mode context for ActionMode menu inflater
 2014-10-29 22:55:09 +00:00
Vladimir Marko
0904509ff8 am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev 
* commit '85d6f299943017f939ecfee9708f10b4e5fddd3e':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:55:04 +00:00
Chris Wren
7837294b84 am 755f4021: fix build break from mis-named DEBUG flag in SystemUI 
* commit '755f4021ae9a21936a04083098ffbbdac912625c':
  fix build break from mis-named DEBUG flag in SystemUI
 2014-10-29 22:54:56 +00:00
Chris Wren
98204c1820 am b7efa04d: Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev 
* commit 'b7efa04d529b87672b1167341852eca8ee9813c7':
  Add logging to diagnose notification click issue.
 2014-10-29 22:54:16 +00:00
Andre Eisenbach
dfc472542f am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 
* commit 'e2502eb9ad5eafc54ae06f06a72493748616dbd5':
  Fix crash during Bluetooth on/off stress test
 2014-10-29 22:54:10 +00:00
David Friedman
3be4e43b4c am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '543a82edd5a0a921570335e71004f33a3a68438f':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 22:54:03 +00:00
Deepanshu Gupta
c2a72054b1 am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '5456230d3b071cf699a4523f3f33bfcb5be4f54c':
  Add missing delegate for AnimatorInflater.
 2014-10-29 22:53:58 +00:00
Geoff Mendal
f658b88fd1 am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9bff44bdc4d91a1502bf2d30c0cbbe76751657f1':
  Import translations. DO NOT MERGE
 2014-10-29 22:53:54 +00:00
Geoff Mendal
550fa6b675 am 2c5e5ef5: (-s ours) am c88fbd3c: (-s ours) Import translations. DO NOT MERGE 
* commit '2c5e5ef50cfe0452935d319936335e655dee894d':
  Import translations. DO NOT MERGE
 2014-10-29 22:53:48 +00:00
Wink Saville
e8ae9961b4 am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '0d1356c4f1a6627e10b2c587a5e3f415e2da1064':
  Import translations. DO NOT MERGE
 2014-10-29 22:53:44 +00:00
Deepanshu Gupta
2df4ea4601 am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit 'bf59e8974d0c18dd3fd14631ad03de66d271a186':
  Skip loading animations.
 2014-10-29 22:53:39 +00:00
Deepanshu Gupta
f82046b233 am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit '122ccfb08fdde43793159d17d263271a0d311a1f':
  Fix multiple styles case in resource resolution.
 2014-10-29 22:53:34 +00:00
Deepanshu Gupta
c5afeb2cbb am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit '62cf56cf99204bc3912119e8bed06e43f7ba6da9':
  Use right theme for drawable inflation.
 2014-10-29 22:53:29 +00:00
Eric Laurent
8f89feba39 SoundTrigger JNI: fix local reference leak. 
Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
 2014-10-29 15:52:43 -07:00
Alan Viverette
73ab31f610 am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 
* commit '7a0ae7ed31a9e7e296c549dfbf035bf4270be69c':
  Add content description to Toolbar collapse button
 2014-10-29 22:51:47 +00:00
Andre Eisenbach
34964701e0 am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 
* commit 'db41880dd3259646b9ea43be6d8a91d4adb40122':
  Fix exception in AudioService when no BT Headset is connected.
 2014-10-29 22:51:38 +00:00
Geoff Mendal
b2c607dbb8 am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ba9836d9726bbc7413a07ae2b86afde8adcd4cc3':
  Import translations. DO NOT MERGE
 2014-10-29 22:50:44 +00:00
Calin Juravle
21c3666eff am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit 'ef0a7e8fdbf60d6e5cc5f274f94516c3077895e5':
  Use native brige only if we have a private data directory.
 2014-10-29 22:50:39 +00:00
Calin Juravle
acbd0025f8 am 5b0f193d: Merge "PreInitializeNativeBridge only if its Available" into lmp-mr1-dev 
* commit '5b0f193d25218557a23bdd7b4ee44d6932b71115':
  PreInitializeNativeBridge only if its Available
 2014-10-29 22:50:34 +00:00
John Spurlock
a410961f79 am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev 
* commit 'f9824b91f3706bb29272564bbf9c51497b51f4a7':
  PowerUI: Suppress warning on incremental drops.
 2014-10-29 22:50:27 +00:00
Jason Monk
736695dc3e am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev 
* commit '5d80f19c145f99eb1a2ada57a6fb1d8c3a6fa8b2':
  QS: Only hide grid if there is detail to show
 2014-10-29 22:50:22 +00:00
Kenny Guy
5cf65f7bf6 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
* commit '8cfb3f1e4dc76c4fa92e889991f0e9dd37823d1b':
  Listen for package changes for all users not just owner.
 2014-10-29 22:50:16 +00:00
Chris Wren
b3239da9a0 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
* commit '402152d6736839d89a9179cd4371201020074797':
  Reveal notification listener settings APIs.
 2014-10-29 22:50:08 +00:00
John Reck
a27e1a366a am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
* commit '141823ec6313d9545b8354ea1e3e017a1da3cfa8':
  Be more conservative about current buffer
 2014-10-29 22:50:03 +00:00
Jorim Jaggi
358aed4587 am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev 
* commit '81aef807d5f1e3e3b5eda1162829e666c295f352':
  Improve doze transitions
 2014-10-29 22:49:51 +00:00