Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,455 Commits 3 Branches 0 Tags
c6a520e0907447e4bb88c608236804fd36ec00f2
Commit Graph

258455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
c6a520e090 Merge "Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e am: 1895addcef" into nyc-mr1-dev-plus-aosp 2016-06-08 01:27:45 +00:00
Chong Zhang
456fc8cd3c Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e 
am: 1895addcef

Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
 2016-06-08 01:27:16 +00:00
Felipe Leme
02e2d72d55 Merge \"Added a getPrimaryStorageSize() method.\" into nyc-mr1-dev 
am: ba3676460a

Change-Id: Ibabc9b60735422360fe770eb7ba57c70532f22c4
 2016-06-08 01:25:34 +00:00
Felipe Leme
2e335cd9a4 Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am: c02ba17898 
am: 53c1637134

Change-Id: Ic53a1fd625879f75b8ff541c0a91336fcaea288b
 2016-06-08 01:25:30 +00:00
TreeHugger Robot
ba3676460a Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev 2016-06-08 01:22:18 +00:00
Felipe Leme
3b37c224b5 Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am: c02ba17898 
am: 9d178342d8

Change-Id: I9afdc281e2fe68c74ef7a676dd4f437013fe909a
 2016-06-08 01:21:57 +00:00
Chong Zhang
1895addcef Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev 
am: 723e5afa9e

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
 2016-06-08 01:19:03 +00:00
Felipe Leme
53c1637134 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev 
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d
 2016-06-08 01:15:06 +00:00
Felipe Leme
9d178342d8 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev 
am: c02ba17898

Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12
 2016-06-08 01:13:55 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
Android Build Merger (Role)
eebd5b2a57 Merge "Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am: c9adac6abb am: c4d9ea8551" into nyc-mr1-dev-plus-aosp 2016-06-08 01:08:43 +00:00
TreeHugger Robot
c02ba17898 Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev 2016-06-08 01:08:42 +00:00
Chong Zhang
2e2e655238 Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am: c9adac6abb 
am: c4d9ea8551

Change-Id: I7e59243cd1535fd4c6f55de0f13021036d838918
 2016-06-08 01:08:14 +00:00
Chong Zhang
fa1c59ca17 Merge \\"Set fontScale in override config to be equal to global.\\" into nyc-dev am: c9adac6abb 
am: 01a3095f5f

Change-Id: I99b830777ca94e095c2d6796681d7aec08ad4d41
 2016-06-08 01:08:09 +00:00
Chong Zhang
01a3095f5f Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev 
am: c9adac6abb

Change-Id: I0291db79581d143cabf5f6bbf8a727c2b8c06df6
 2016-06-08 01:04:16 +00:00
Chong Zhang
c4d9ea8551 Merge \"Set fontScale in override config to be equal to global.\" into nyc-dev 
am: c9adac6abb

Change-Id: If62da650207267872815af6f7e793b193e23d10e
 2016-06-08 01:04:12 +00:00
Chong Zhang
c9adac6abb Merge "Set fontScale in override config to be equal to global." into nyc-dev 2016-06-08 00:59:44 +00:00
Siyamed Sinir
3d077daaac Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am: 96c3e5504b 
am: df3d144b17

Change-Id: I50d759b3865fe66e23f5bc82199c9b512a3489c1
 2016-06-08 00:59:44 +00:00
Siyamed Sinir
bb05c332b1 Merge \\"Fix int overflow in SpannableStringBuilder.replace\\" into nyc-dev am: 96c3e5504b 
am: 9eddf7ae8e

Change-Id: I2901fa9b6debdac559637732cc5e4eaf4eed8467
 2016-06-08 00:56:45 +00:00
Android Build Merger (Role)
ef5ce09ad4 Merge "Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am: c82a2b5358 am: 66c2bfcede" into nyc-mr1-dev-plus-aosp 2016-06-08 00:50:47 +00:00
Andreas Gampe
68a9413c84 Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am: c82a2b5358 
am: 66c2bfcede

Change-Id: I3c4525f3931443aa6a2e16816924850e41c952b7
 2016-06-08 00:50:17 +00:00
Siyamed Sinir
df3d144b17 Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev 
am: 96c3e5504b

Change-Id: I98179e88a6ce8838dd84131b9402255920822856
 2016-06-08 00:50:15 +00:00
Siyamed Sinir
9eddf7ae8e Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev 
am: 96c3e5504b

Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748
 2016-06-08 00:50:14 +00:00
Andreas Gampe
a2fe97ffa4 Merge \\"Frameworks/base: Fix FastPrintWriter infinite loop\\" into nyc-dev am: c82a2b5358 
am: 89b7934905

Change-Id: Idaa84ae75512929656f63318db819232f42d91f7
 2016-06-08 00:50:03 +00:00
Siyamed Sinir
96c3e5504b Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev 2016-06-08 00:46:28 +00:00
Android Build Merger (Role)
a8705f62ea Merge "Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add am: 2cf5b73c0a" into nyc-mr1-dev-plus-aosp 2016-06-08 00:46:14 +00:00
Andreas Gampe
66c2bfcede Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev 
am: c82a2b5358

Change-Id: I3da283b088e2e0d689ac35d634823497fa2fece1
 2016-06-08 00:45:35 +00:00
Jim Miller
126a026393 Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add 
am: 2cf5b73c0a

Change-Id: Ie2c8adbeefaab6f9fa1ff6802d938e31be065b84
 2016-06-08 00:45:35 +00:00
Andreas Gampe
89b7934905 Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev 
am: c82a2b5358

Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
 2016-06-08 00:45:34 +00:00
Jim Miller
b78840f141 Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: 4401e24add 
am: 21c77ed1a8

Change-Id: I7c561e027b7216686b8d096ac97e6c6c5a633eaf
 2016-06-08 00:43:48 +00:00
TreeHugger Robot
c82a2b5358 Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev 2016-06-08 00:39:00 +00:00
Jim Miller
2cf5b73c0a Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev 
am: 4401e24add

Change-Id: Ic10c6505e4583f487a41eb659227b955013949b7
 2016-06-08 00:38:31 +00:00
Jim Miller
21c77ed1a8 Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev 
am: 4401e24add

Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
 2016-06-08 00:38:25 +00:00
TreeHugger Robot
4401e24add Merge "Move legacy full disk encryption code to Settings." into nyc-dev 2016-06-08 00:31:31 +00:00
Sharvil Nanavati
591c8ece75 Merge \"Fix build break by adding missing parenthesis.\" into nyc-mr1-dev 
am: f4f7c64c75

Change-Id: Ie10bd4ea8d7345550fb4a42090320d31669321fa
 2016-06-07 23:47:39 +00:00
Sharvil Nanavati
f4f7c64c75 Merge "Fix build break by adding missing parenthesis." into nyc-mr1-dev 2016-06-07 23:43:45 +00:00
Felipe Leme
18202e00bd Added a getPrimaryStorageSize() method. 
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **
 2016-06-07 16:42:35 -07:00
Sharvil Nanavati
957abc8318 Fix build break by adding missing parenthesis. 
Change-Id: Ia9a47e24b25e3093f19aeea297a86964c8f00722
 2016-06-07 16:41:16 -07:00
Felipe Leme
29de4922db Duplicate file descriptor when dumping asynchronously. 
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
 2016-06-07 16:35:50 -07:00
David Sehr
337c8ae3e7 Merge \\"Add usage line for dump-profiles\\" into nyc-dev am: a85c1e8e69 
am: eff498946f

Change-Id: I763463605dd5ed84aec0f3c6502f944fefe24388
 2016-06-07 23:16:40 +00:00
David Sehr
18821cd49b Merge \\"Add usage line for dump-profiles\\" into nyc-dev am: a85c1e8e69 
am: 514c1ae4c6

Change-Id: I798f8c789c8735462c556c6c1c469a1abe1f6f4a
 2016-06-07 23:13:11 +00:00
David Sehr
eff498946f Merge \"Add usage line for dump-profiles\" into nyc-dev 
am: a85c1e8e69

Change-Id: I62cf1d3c0ea6295500fbb730dfa75e7046c8c06d
 2016-06-07 23:10:07 +00:00
David Sehr
514c1ae4c6 Merge \"Add usage line for dump-profiles\" into nyc-dev 
am: a85c1e8e69

Change-Id: I301304ff28674e00c8c1d49b968f090838ae64b3
 2016-06-07 23:07:41 +00:00
Dirk Dougherty
30b42ad83b Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6 am: f91783c8a5 
am: ba446488aa

Change-Id: Ieff4647f43be330106f0d0af61c8c285c3804508
 2016-06-07 23:04:33 +00:00
Dirk Dougherty
edc441bbf4 Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6 am: f91783c8a5 
am: db4948a1d3

Change-Id: I4c707846a9dd911f96e57bb0ba91deb7a7d3c94d
 2016-06-07 23:02:51 +00:00
Andreas Gampe
ce78b9e114 Frameworks/base: Fix FastPrintWriter infinite loop 
Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
 2016-06-07 16:02:23 -07:00
David Sehr
a85c1e8e69 Merge "Add usage line for dump-profiles" into nyc-dev 2016-06-07 23:01:10 +00:00
Dirk Dougherty
ba446488aa Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6 
am: f91783c8a5

Change-Id: I887922ef823327cb484c113f1b4d85ebf01f9576
 2016-06-07 22:57:42 +00:00
Dirk Dougherty
db4948a1d3 Minor fixes to distribute cards and fab. am: 5ec3a404fb am: ba9c3d585f am: f5c85abac6 
am: f91783c8a5

Change-Id: I1094dd6a0a256ce7dd4942ce02374b4b44786278
 2016-06-07 22:57:41 +00:00
Chong Zhang
92ab103cb6 Set fontScale in override config to be equal to global. 
The default fontScale in EMPTY config is 1.0. This will result in
updateFrom always overriding the fontScale to 1.0 since it's non-zero.

We can't set it to 0.0 either as that will make the override config
not equal to EMPTY. The rest of the code doesn't work well with that.

So here we always set the override fontScale to be idential to global.

bug: 29113700
Change-Id: I1dbe507145b8190a9ae5e108948c833d4e037e1d
 2016-06-07 15:56:53 -07:00