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

21362 Commits

Author SHA1 Message Date
Elliott Hughes
07b68d8ad4 am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit '81fcede86d89287a5add53b256d384f9a370d77d':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-14 17:22:44 +00:00
Elliott Hughes
b8175ad3bf am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:08:39 +00:00
Elliott Hughes
c02ddd6a0a am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev 
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.
 2014-10-13 22:04:11 +00:00
Elliott Hughes
c130b428c5 Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev 2014-10-13 20:55:30 +00:00
Elliott Hughes
9c33f28d91 Ensure that the SIM language doesn't override the user language on the encryption UI. 
Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17
 2014-10-13 12:39:56 -07:00
Yohei Yukawa
d6d0c3f54a am 84928e72: am 9ca39d74: am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '84928e72e48f61644f2812a28868c9e6e91fadbe':
  Update config when "Show input method" is changed
 2014-10-13 19:11:45 +00:00
Michael Wright
d61b3014b3 am 07dee169: am 48ca08a2: am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '07dee169f4efe8f5ab10a39ebf5a41563322cecd':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 19:11:36 +00:00
Yohei Yukawa
9ca39d744c am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '540861c925df9b3743251e5d219cd5fe790f9048':
  Update config when "Show input method" is changed
 2014-10-13 18:57:58 +00:00
Michael Wright
48ca08a21c am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '43a7dcc12b212ac4f00af294b13d931dca3c3f8d':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:57:50 +00:00
Yohei Yukawa
540861c925 am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev 
* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
  Update config when "Show input method" is changed
 2014-10-13 18:48:16 +00:00
Michael Wright
43a7dcc12b am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:48:07 +00:00
Yohei Yukawa
2dfd8d578a Merge "Update config when "Show input method" is changed" into lmp-dev 2014-10-13 18:42:50 +00:00
Michael Wright
265d3e9d3e Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev 2014-10-13 17:30:32 +00:00
Jinsuk Kim
95bc6f1623 am 2c716fcf: am e46fdb43: Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 
* commit '2c716fcf8f29ffff705316db1ac4a23b9f441502':
  CEC: Queue actions for starting later when not ready
 2014-10-13 05:26:33 +00:00
Jinsuk Kim
e46fdb43c0 Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 2014-10-13 05:16:11 +00:00
Jinsuk Kim
0e5892213b am 5ddae6ac: am 8ea712f4: Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev 
* commit '5ddae6ac3d96f0edaa0286143519607f97dd9c08':
  CEC: Do not publish the service if native/HAL is not ready
 2014-10-13 03:38:43 +00:00
Jinsuk Kim
6f87b4e6b6 CEC: Queue actions for starting later when not ready 
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17933899
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7
 2014-10-13 11:38:16 +09:00
Jinsuk Kim
08f1ab02d6 CEC: Do not publish the service if native/HAL is not ready 
This helps detect the issue sooner by checking the availability
of the service and avoid crashing at a later point.

Bug: 17897529
Change-Id: Iab0eeffb00221e5a7e6e36d446eeef7c92da1f82
 2014-10-13 10:44:50 +09:00
Dianne Hackborn
89bd24067a am ce00f22f: am ec941de2: am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'ce00f22f26d5c748c7d4d82bc72480c42f0de45a':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 04:55:31 +00:00
Dianne Hackborn
ec941de2fc am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'eddb2b3805d323ad1b6e1a09f2e64736b2eb2cf4':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 02:50:12 +00:00
Dianne Hackborn
eddb2b3805 am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'bbbeafa9bf0c4598b32c615c72e2c87ef62c85e9':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 00:29:53 +00:00
Jinsuk Kim
b25c225c28 am 0878e8c9: am 62ba538b: resolved conflicts for merge of 3170c035 to lmp-mr1-dev 
* commit '0878e8c9d1b71f350a8513d373e6f8e74129624a':
  CEC: Prevents HdmiControlService from turning on TV on wakeup
 2014-10-10 23:04:43 +00:00
Jinsuk Kim
62ba538b94 resolved conflicts for merge of 3170c035 to lmp-mr1-dev 
Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86
 2014-10-11 07:23:18 +09:00
Dianne Hackborn
ce09f5a53c Fix issue #17829949: Don't kill Bluetooth service... 
...even in extreme low memory condition

Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to
go to a higher oom adj level.

Fix some problems when this is done from a system or persistent
process, where this would go to a level that is *too* high.  Instead,
introduce a new oom adj level for it that is right below persistent.

Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
 2014-10-10 15:05:33 -07:00
Dianne Hackborn
5457d5ccb6 am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
  Improve some docs, fix some debugging.
 2014-10-10 21:06:48 +00:00
Dianne Hackborn
e61e68d001 am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
  Improve some docs, fix some debugging.
 2014-10-10 20:47:07 +00:00
Christopher Tate
4cc3cff6f9 am 2ec14166: am df9cab2f: am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit '2ec14166958a9460164ff0d6cf45fa22255604b0':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 17:14:59 +00:00
Dianne Hackborn
a22d2fc319 am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '57af6ac767ff7063adbff694ff784e9ddc442a7e':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 17:14:36 +00:00
Robin Lee
967bc00fc1 am d92e9beb: am 499a3629: am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit 'd92e9bebdfb37a220cc35d9f64292d4e854a7d6e':
  DevicePolicy: One cert tracker warning per profile
 2014-10-10 16:59:31 +00:00
Christopher Tate
798965a693 am c049e123: am 97cb995e: am f857b272: am 2e0f6682: Merge "Also monitor MOVED_TO events for wallpaper updates" into lmp-dev 
* commit 'c049e123bec7a573b012a2a024cbbb55ce32c402':
  Also monitor MOVED_TO events for wallpaper updates
 2014-10-10 16:59:17 +00:00
Jeff Brown
1a62427231 am 847d2692: am 8aa2e3f1: am ab46eda8: am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev 
* commit '847d2692978bb8efcd5335feb3ea27aa87948f42':
  Ensure we correctly unblank displays when added.
 2014-10-10 16:59:00 +00:00
Christopher Tate
5a65116141 am 353e4a99: am c09f6e69: am b03b6a6c: am 6dea8de7: Merge "Actually tell the widget service that restore is starting" into lmp-dev 
* commit '353e4a99e92dbf8739b91e868aad7c2a86f0a7e7':
  Actually tell the widget service that restore is starting
 2014-10-10 16:58:45 +00:00
Jeff Hao
915bd5ca4f am 4b34b329: am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev 
* commit '4b34b329fb242985eedec63418b50357b00f6bd8':
  Improve priority ordering of apps when performing boot dexopt.
 2014-10-10 16:58:14 +00:00
RoboErik
ee512f515f am d9be933f: am 51ff1c93: am f9122232: am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 
* commit 'd9be933fc2e68f5f1ec5503e72f39b85abd65b52':
  Ensure metadata bundles are unparceled before making them available
 2014-10-10 16:57:55 +00:00
Georgi Nikolov
3cda47927a am fb7bf887: am ffdc68e0: am 682d77dc: am 6eb0f480: Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 
* commit 'fb7bf887eeacae9de156f819f0575d250b8efc06':
  BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler
 2014-10-10 16:57:45 +00:00
Ye Wen
b9e984594c am b6566c37: am ac9d81b9: am 108ba84a: am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 
* commit 'b6566c373160ab09f346092abeb32eee2928bce1':
  Make MmsServiceBroker more robust to MmsService crashes
 2014-10-10 16:57:40 +00:00
Jinsuk Kim
3170c03543 am 294297df: Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev 
* commit '294297df4e3f327a81d922563c518aee8ee3e51d':
  CEC: Prevents HdmiControlService from turning on TV on wakeup
 2014-10-10 14:45:33 +00:00
Dianne Hackborn
18d2d51ee3 am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev 
* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
  Improve some docs, fix some debugging.
 2014-10-10 14:44:59 +00:00
Yohei Yukawa
8629784bbb Update config when "Show input method" is changed 
This is a follow up CL for I2237ded850a0d4ab43ca441d0b7df1.

Seems that we still need to update config settings every
time when "Show input method" is changed.

BUG: 17666032
Change-Id: I480aeaa038bef9c3c20e8f0b36110e92a35809db
 2014-10-10 15:13:28 +09:00
Svetoslav
73a02f4337 am 202ff5f2: am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '202ff5f2e0c53ea68d40104f34084cb39b9906f1':
  Restored widget provider id not properly updated.
 2014-10-10 04:26:46 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Jinsuk Kim
294297df4e Merge "CEC: Prevents HdmiControlService from turning on TV on wakeup" into lmp-dev 2014-10-10 03:52:27 +00:00
Dianne Hackborn
ab4a81b3c6 Improve some docs, fix some debugging. 
- Add docs to Binder, Messenger, ResultReceier to explain their
  relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
  and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
  the input as a package, so including all processes that are
  running code of that package.
- Fix top-level per-package debug output to correctly include all
  of these improvements and give them a little more time (10s) to
  complete for timing out.

Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
 2014-10-09 18:21:59 -07:00
Christopher Tate
df9cab2f12 am ad716e42: am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-10 00:31:53 +00:00
Dianne Hackborn
d190a5ca4c am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-10 00:30:33 +00:00
Christopher Tate
ad716e42e8 am 2aa1d18e: Fix bug 17931760 - spurious timeout leads to mayhem 
* commit '2aa1d18e3acd269ed7a5f5a4843d447735f0676c':
  Fix bug 17931760 - spurious timeout leads to mayhem
 2014-10-09 23:06:27 +00:00
Michael Wright
5018df761b Clean-up ColorFade's shaders and buffers. 
Bug: 17672241
Change-Id: I73328ee4d83c3a8700b7b19b661bcaec7ada877f
 2014-10-09 15:44:56 -07:00
Christopher Tate
2aa1d18e3a Fix bug 17931760 - spurious timeout leads to mayhem 
We know a priori that the PMBA metadata package's backup pass
doesn't need to be tracked for timeout, because it's run inline
rather than as an asynchronous separate-process operation.

Change-Id: Ifd21ab3a016917f5e557a38c1c88f8d8ac1337d2
 2014-10-09 15:20:24 -07:00
Dianne Hackborn
0e259ce2d7 am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev 
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
  Implement issue #17906468: Allow search request to fall back to global search
 2014-10-09 19:30:26 +00:00
Robin Lee
499a36294b am 4a718f2a: am a300025d: Merge "DevicePolicy: One cert tracker warning per profile" into lmp-dev 
* commit '4a718f2af33159e58f4ad639d9d0e633a6ca8a8f':
  DevicePolicy: One cert tracker warning per profile
 2014-10-09 19:17:39 +00:00