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

211884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
ce8fc7b919 am 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit '42efe5b333c1f28127da57a44b39bd72cfbe81b2':
  Add anydpi to the providing-resources docs
 2015-10-06 01:11:20 +00:00
Adam Lesinski
42efe5b333 am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit 'c87996e5382a5e9bc4ae400e1879d7c655d8b46a':
  Add anydpi to the providing-resources docs
 2015-10-06 01:03:49 +00:00
Adam Lesinski
c87996e538 am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit '8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
  Add anydpi to the providing-resources docs
 2015-10-06 00:57:43 +00:00
Adam Lesinski
8461f2fa02 am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit '46684d2caeef93f43be260d996e925ea6e4147ea':
  Add anydpi to the providing-resources docs
 2015-10-06 00:51:13 +00:00
Jean-Michel Trivi
ec09010730 am 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper thread 
* commit '7f33f6e92fa22f47af2f8d61883197013fae4c66':
  Fix AudioService rotation helper thread
 2015-10-06 00:27:18 +00:00
Jean-Michel Trivi
7f33f6e92f am 38b987ab: am 0155856a: Fix AudioService rotation helper thread 
* commit '38b987ab794f7e249a239db26dcf98ca8d2ff72b':
  Fix AudioService rotation helper thread
 2015-10-06 00:20:09 +00:00
Jean-Michel Trivi
38b987ab79 am 0155856a: Fix AudioService rotation helper thread 
* commit '0155856a1d1cb272d83b6175953dd7151fe65daa':
  Fix AudioService rotation helper thread
 2015-10-06 00:14:01 +00:00
Pirama Arumuga Nainar
6314f0bf9b am 456a4516: am a186456f: Safely handle interrupts during Thread.join() 
* commit '456a451668728a18198927fe93f19896929535d3':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:47:42 +00:00
Pirama Arumuga Nainar
456a451668 am a186456f: Safely handle interrupts during Thread.join() 
* commit 'a186456ff58a6091603956b6788565a273a29485':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:42:13 +00:00
Pirama Arumuga Nainar
6ac1aa3d4a am c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread.join()" 
* commit 'c9390c8baf0a41633c176d6d9a2d7e5d0c61c387':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:39:04 +00:00
Pirama Arumuga Nainar
c9390c8baf am 46b51097: Merge "Safely handle interrupts during Thread.join()" 
* commit '46b51097b92900866ac5b25762f622d3ceb1be5d':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:33:38 +00:00
Pirama Arumuga Nainar
a186456ff5 Safely handle interrupts during Thread.join() 
Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit 83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
 2015-10-05 16:31:34 -07:00
Pirama Arumuga Nainar
46b51097b9 Merge "Safely handle interrupts during Thread.join()" 2015-10-05 23:27:10 +00:00
Deepanshu Gupta
034d10bf6c am e5d3baf2: LayoutLib: Fix bitmap scaling. 
* commit 'e5d3baf22f046d0a579128fc258f6b92e700ca02':
  LayoutLib: Fix bitmap scaling.
 2015-10-05 23:22:18 +00:00
Deepanshu Gupta
e5d3baf22f LayoutLib: Fix bitmap scaling. 
Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
 2015-10-05 16:08:54 -07:00
Pirama Arumuga Nainar
83461d73bc Safely handle interrupts during Thread.join() 
Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
 2015-10-05 15:45:47 -07:00
Adam Lesinski
46684d2cae Merge "Add anydpi to the providing-resources docs" into mnc-dev 2015-10-05 22:31:22 +00:00
Jean-Michel Trivi
0155856a1d Fix AudioService rotation helper thread 
Fix a race condition where the wait index can be incremented inbetween
  the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
  the last sleep is useless.

Bug 24677424

Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
 2015-10-05 15:26:21 -07:00
Adam Lesinski
4cad00b696 Add anydpi to the providing-resources docs 
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
 2015-10-05 19:39:40 +00:00
Nick Armstrong-Crews
dd62fb4392 am f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 
* commit 'f107709fb3f884f904deb1f3c09a88dd411ea30d':
  Fix the logging of wake time saved by Ungaze.
 2015-10-05 18:34:57 +00:00
Nick Armstrong-Crews
f107709fb3 am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 
* commit '13a71fbcf056d34421a7740a75e2c8dc11d30eb6':
  Fix the logging of wake time saved by Ungaze.
 2015-10-05 18:29:24 +00:00
Nick Armstrong-Crews
13a71fbcf0 Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 2015-10-05 18:23:12 +00:00
Nick Armstrong-Crews
024872ea70 Fix the logging of wake time saved by Ungaze. 
The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.

Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
 2015-10-05 18:22:54 +00:00
Geoff Mendal
5c6fff5431 am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad111b653251e0af212da964d56112cda7d628d9':
  Import translations. DO NOT MERGE
 2015-10-05 14:16:19 +00:00
Geoff Mendal
ad111b6532 am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE 
* commit '3daab8e7a7e68ceb8f15cfcb0d8becf4e86a6c05':
  Import translations. DO NOT MERGE
 2015-10-05 14:09:18 +00:00
Geoff Mendal
3daab8e7a7 am faebbe82: (-s ours) Import translations. DO NOT MERGE 
* commit 'faebbe82fa72036db75d679d366681822d2d551c':
  Import translations. DO NOT MERGE
 2015-10-05 14:05:00 +00:00
Geoff Mendal
faebbe82fa Import translations. DO NOT MERGE 
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
 2015-10-05 06:58:33 -07:00
Stephen Hines
697e3dd6b9 am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master 
* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction
 2015-10-03 00:46:17 +00:00
Stephen Hines
ee144b1e60 resolved conflicts for bd57dac5 to stage-aosp-master 
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
 2015-10-02 17:34:05 -07:00
Pirama Arumuga Nainar
3cb53543e2 am 24f02483: am 67775422: Retry if interrupted before mMessageThread has joined 
* commit '24f02483172a9802222da29e9db3832b93dd46a6':
  Retry if interrupted before mMessageThread has joined
 2015-10-02 22:59:51 +00:00
Pirama Arumuga Nainar
24f0248317 am 67775422: Retry if interrupted before mMessageThread has joined 
* commit '677754225d9dcd3982d486bc4ead31d6f74de89b':
  Retry if interrupted before mMessageThread has joined
 2015-10-02 22:54:04 +00:00
Pirama Arumuga Nainar
677754225d Retry if interrupted before mMessageThread has joined 
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit 2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
 2015-10-02 15:30:33 -07:00
Chris Craik
bd57dac5d5 Merge "Don't unregister Fonts from renderer at destruction" 2015-10-02 22:30:09 +00:00
Pirama Arumuga Nainar
e3ae9e71b3 am 5fbb2452: am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined" 
* commit '5fbb245230317b5ca312556b73380195871827eb':
  Retry if interrupted before mMessageThread has joined
 2015-10-02 22:16:20 +00:00
Pirama Arumuga Nainar
5fbb245230 am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined" 
* commit 'ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
  Retry if interrupted before mMessageThread has joined
 2015-10-02 22:08:11 +00:00
Pirama Arumuga Nainar
ca3e5aeaa6 Merge "Retry if interrupted before mMessageThread has joined" 2015-10-02 21:58:50 +00:00
Pirama Arumuga Nainar
2f25ce7753 Retry if interrupted before mMessageThread has joined 
Bug: 24342101

If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing.  Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.

Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
 2015-10-02 21:42:12 +00:00
Chris Craik
148c78f825 Don't unregister Fonts from renderer at destruction 
bug:24584749

Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.

Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
 2015-10-02 14:21:46 -07:00
Tim Murray
e6a4f90261 am 0e28d919: am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 
* commit '0e28d9196deb28af89c0ea075a91ca45c989fde9':
  Send POWER_HINT_INTERACTION on rotate.
 2015-10-02 20:59:09 +00:00
Tim Murray
0e28d9196d am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 
* commit '3af80eff608b2ee2de7291f82b9163d5df4b15cf':
  Send POWER_HINT_INTERACTION on rotate.
 2015-10-02 20:54:58 +00:00
Tim Murray
3af80eff60 am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 
* commit '791763796e5f21e34c3ae81c1faad2a4c1a515dd':
  Send POWER_HINT_INTERACTION on rotate.
 2015-10-02 20:48:04 +00:00
Tim Murray
791763796e Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev 2015-10-02 20:43:30 +00:00
Jorim Jaggi
99d661ffc0 am c69f4b96: am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev 
* commit 'c69f4b962e1111ed44399c1243829384f83b9f2f':
  Add minimum time for double tap gesture
 2015-10-02 20:15:06 +00:00
Jorim Jaggi
c69f4b962e am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev 
* commit '54afa2bdc2be09542feea634f7a87a0f2f9defac':
  Add minimum time for double tap gesture
 2015-10-02 20:08:11 +00:00
Jorim Jaggi
54afa2bdc2 am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev 
* commit '8c66fa94361b51f39f87530f6d1f714120437cc6':
  Add minimum time for double tap gesture
 2015-10-02 20:00:34 +00:00
Jorim Jaggi
8c66fa9436 Merge "Add minimum time for double tap gesture" into mnc-dr-dev 2015-10-02 19:55:26 +00:00
Jean-Michel Trivi
182e628711 am 11568be8: am 5f48baef: am 24806db8: AudioService: alternative way of handling device rotation 
* commit '11568be85e943063c43a9528da0a6b5fb2a92b3b':
  AudioService: alternative way of handling device rotation
 2015-10-02 08:27:01 +00:00
Jianing Wei
5a15b95291 am 98e0cec2: am 3c708be3: am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc. 
* commit '98e0cec203cd5463c9dd314455ef02781e241b44':
  Camera2: Update video stabilization API doc.
 2015-10-02 08:26:54 +00:00
Jean-Michel Trivi
11568be85e am 5f48baef: am 24806db8: AudioService: alternative way of handling device rotation 
* commit '5f48baef5f42dd39fff9bc03b3ac8ba222955b86':
  AudioService: alternative way of handling device rotation
 2015-10-02 02:56:39 +00:00
Jean-Michel Trivi
5f48baef5f am 24806db8: AudioService: alternative way of handling device rotation 
* commit '24806db8f6f523542510097ce0af4a32beeda83b':
  AudioService: alternative way of handling device rotation
 2015-10-02 02:52:40 +00:00