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

206075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
8fb0121cb6 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed 
am: 02bf433f90

* commit '02bf433f902aa34483aa2fc1b410f393b35058f1':
  Fix race condition when setting default ringtones
 2015-11-09 21:34:14 +00:00
Marco Nelissen
02bf433f90 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev 
am: 83702ec3ed

* commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff':
  Fix race condition when setting default ringtones
 2015-11-09 21:28:32 +00:00
Marco Nelissen
83702ec3ed Merge "Fix race condition when setting default ringtones" into mnc-dr-dev 2015-11-09 21:21:55 +00:00
Geoff Mendal
919b74ae35 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: f3b3a2ce2b  -s ours

* commit 'f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
  Import translations. DO NOT MERGE
 2015-11-09 17:57:11 +00:00
Geoff Mendal
f3b3a2ce2b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-09 17:51:40 +00:00
Geoff Mendal
016d9e7c4d Import translations. DO NOT MERGE 
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
 2015-11-09 18:43:57 +01:00
Geoff Mendal
9ab5fb52a0 Import translations. DO NOT MERGE am: 49eeda33dd -s ours 
am: 0414438abe  -s ours

* commit '0414438abe0718f5007d7b580981d6ba204b655c':
  Import translations. DO NOT MERGE
 2015-11-09 17:34:42 +00:00
Geoff Mendal
0414438abe Import translations. DO NOT MERGE 
am: 49eeda33dd  -s ours

* commit '49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
  Import translations. DO NOT MERGE
 2015-11-09 17:27:25 +00:00
Geoff Mendal
49eeda33dd Import translations. DO NOT MERGE 
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
 2015-11-09 18:10:12 +01:00
Geoff Mendal
a1d0738253 Import translations. DO NOT MERGE 
am: 210f0afaf9  -s ours

* commit '210f0afaf9011d044d261f1044a1a7368cb89e7e':
  Import translations. DO NOT MERGE
 2015-11-09 13:29:12 +00:00
Geoff Mendal
210f0afaf9 Import translations. DO NOT MERGE 
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
 2015-11-09 05:11:08 -08:00
Marco Nelissen
f2cb9341ff Fix race condition when setting default ringtones 
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
 2015-11-06 10:50:47 -08:00
Chris Elliott
54919264d8 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours 
am: 634221adb2

* commit '634221adb28f765233889cca32078e4b042198f3':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-06 18:41:35 +00:00
Chris Elliott
634221adb2 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE 
am: d9a2be8d3d  -s ours

* commit 'd9a2be8d3d5bd0e170fec71c316373e268a8c17f':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-06 18:36:16 +00:00
Chris Elliott
d9a2be8d3d DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE 
This reverts commit 7e19e286cc990daaafe934ed82ddfa00762907d6.

Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
 2015-11-06 17:41:17 +00:00
Chris Craik
c06ccd77c1 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 
am: 17fc83cbde

* commit '17fc83cbde8ab1e92664d12a0fed306e9054ca55':
  Revert "Remove -ffast-math from libhwui makefile"
 2015-11-05 20:31:39 +00:00
Jeff Sharkey
73d60ff36f Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 
am: 2de7e39ffa

* commit '2de7e39ffa387b370e5997542811fd05a73cb8fc':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:30:12 +00:00
Chris Craik
17fc83cbde Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev 
am: 0cf48e9120

* commit '0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
  Revert "Remove -ffast-math from libhwui makefile"
 2015-11-05 20:25:34 +00:00
Jeff Sharkey
2de7e39ffa Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev 
am: e10faaa410

* commit 'e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:23:46 +00:00
Chris Craik
0cf48e9120 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev 2015-11-05 20:21:45 +00:00
Tenghui Zhu
d829ab7683 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c 
am: 1c7fbe0efb

* commit '1c7fbe0efbabe5c15ba72e16053551a8fdae1b92':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:20:29 +00:00
Jeff Sharkey
e10faaa410 Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev 2015-11-05 20:17:13 +00:00
Tenghui Zhu
1c7fbe0efb Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev 
am: 76d20b4a5c

* commit '76d20b4a5c6463235d9497b8018a38c059a6761c':
  When the incoming light source is invalid, don't generate any shadow
 2015-11-05 20:13:05 +00:00
Joe LaPenna
efcb281bec Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE 
am: 88c7c3e080  -s ours

* commit '88c7c3e08051f4a2be8ee5194214678a07ff7f01':
  Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
 2015-11-05 20:09:17 +00:00
Tenghui Zhu
76d20b4a5c Merge "When the incoming light source is invalid, don't generate any shadow" into mnc-dr-dev 2015-11-05 20:05:37 +00:00
Joe LaPenna
88c7c3e080 Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE 
Also remove DEBUG-related timeout changes to have consistent behavior.

BUG: 24247417
BUG: 25463669
BUG: 23753686

Change-Id: Icfbb1531173477f2649f7f99e3bef9860e5a9ec2
 2015-11-05 11:58:48 -08:00
Jeff Sharkey
f131e1aae9 Kick movement preconditions onto handler thread. 
The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app.  If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.

Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.

Bug: 25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8
 2015-11-05 10:28:43 -08:00
Chris Craik
e0fa7476a5 Revert "Remove -ffast-math from libhwui makefile" 
This reverts commit e02ec7c37a92fd63748a610bac6a23d0409788cf.

Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931
 2015-11-05 17:58:28 +00:00
Deepanshu Gupta
71093465ab Merge "Fix Switch colors" into mnc-ub-dev 2015-11-05 17:21:16 +00:00
Deepanshu Gupta
c9b8f95c99 Fix Switch colors 
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.

Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
 2015-11-05 09:20:07 -08:00
Teng-Hui Zhu
cf22d184a3 When the incoming light source is invalid, don't generate any shadow 
b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
 2015-11-04 17:04:18 -08:00
Riley Andrews
6c1144dc0f Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d 
am: 2c740f1dcf

* commit '2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
  Convert ashmem bitmap thresholds to constants.
 2015-11-04 20:30:48 +00:00
Riley Andrews
2c740f1dcf Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev 
am: c8bb39d98d

* commit 'c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
  Convert ashmem bitmap thresholds to constants.
 2015-11-04 20:24:36 +00:00
Riley Andrews
c8bb39d98d Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev 2015-11-04 20:18:35 +00:00
Chris Craik
a853bb450c Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b 
am: 8b581e2bc7

* commit '8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
  Early return when the scale is 0.
 2015-11-04 19:40:02 +00:00
Chris Craik
8b581e2bc7 Merge "Early return when the scale is 0." into mnc-dr-dev 
am: 10eb6ab94b

* commit '10eb6ab94b932c33a708e007b0681b26930260e3':
  Early return when the scale is 0.
 2015-11-04 19:33:11 +00:00
Chris Craik
1938c39f77 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 
am: 62b16e2e10

* commit '62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
  Remove -ffast-math from libhwui makefile
 2015-11-04 19:33:11 +00:00
Chris Craik
10eb6ab94b Merge "Early return when the scale is 0." into mnc-dr-dev 2015-11-04 19:28:39 +00:00
Chris Craik
62b16e2e10 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev 
am: c4aaf0f4b8

* commit 'c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
  Remove -ffast-math from libhwui makefile
 2015-11-04 19:27:19 +00:00
Chris Craik
c4aaf0f4b8 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev 2015-11-04 19:20:52 +00:00
Teng-Hui Zhu
cdce35a7e8 Early return when the scale is 0. 
b/24534579

Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit 8d0ec389531d071529fb0a800f10733b057205d9)
 2015-11-04 18:31:50 +00:00
Chris Craik
e02ec7c37a Remove -ffast-math from libhwui makefile 
bug:25417885

Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a
 2015-11-04 10:14:57 -08:00
Geoff Mendal
c5b905f500 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours 
am: cbe037b01a  -s ours

* commit 'cbe037b01ab25dfbab1cb6ea0fa137787e747ab7':
  Import translations. DO NOT MERGE
 2015-11-04 18:12:19 +00:00
John Reck
e22d81debd Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev 2015-11-04 18:11:21 +00:00
John Reck
26f50df754 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b 
am: f8635c2e04

* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
  Revert "Use clang for libhwui"
 2015-11-04 18:10:52 +00:00
John Reck
632d26d1b0 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b 
am: f8635c2e04

* commit 'f8635c2e043b6466f65cc0159a8f4021701d2165':
  Revert "Use clang for libhwui"
 2015-11-04 18:09:49 +00:00
Geoff Mendal
7c941cd30c Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours 
am: d4d6fdefdf  -s ours

* commit 'd4d6fdefdf83018e46e8de56f0e1679954bb398a':
  Import translations. DO NOT MERGE
 2015-11-04 18:08:13 +00:00
Geoff Mendal
cbe037b01a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 8e7ab07ce7  -s ours

* commit '8e7ab07ce76c20da653e098adfe38da867753305':
  Import translations. DO NOT MERGE
 2015-11-04 18:00:48 +00:00
John Reck
f8635c2e04 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev 
am: 1e1fbd804b

* commit '1e1fbd804b71419736eac4bf537f0a454687b209':
  Revert "Use clang for libhwui"
 2015-11-04 17:59:15 +00:00
Geoff Mendal
d4d6fdefdf Import translations. DO NOT MERGE 
am: 4c9cdbc7ba  -s ours

* commit '4c9cdbc7ba72d6dc09e0f2bacbf8641c764045ca':
  Import translations. DO NOT MERGE
 2015-11-04 17:57:51 +00:00