Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
267,288 Commits 3 Branches 0 Tags
e6b23b6ab9bf5e4e88fd6b720c911424efa4f501
Commit Graph

61355 Commits

Author SHA1 Message Date
George Mount
e6b23b6ab9 Merge \\"Re-add Internal API for cross-task Activity used by assistant.\\" into nyc-mr1-dev am: 174e41b1fd 
am: dff1fa4bb9

Change-Id: I76afa8d89b2ac1624a36b3114bd3891c9c734cee
 2016-06-08 20:39:54 +00:00
George Mount
dff1fa4bb9 Merge \"Re-add Internal API for cross-task Activity used by assistant.\" into nyc-mr1-dev 
am: 174e41b1fd

Change-Id: I5f3a1b398af15963b317fbce6726d77ef85c60b2
 2016-06-08 20:33:58 +00:00
TreeHugger Robot
174e41b1fd Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-08 20:23:03 +00:00
Alan Viverette
7fa09ec4dc Merge \"Return correct default theme on API >= 24\" into nyc-dev 
am: afaa1e9db1

Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497
 2016-06-08 20:20:44 +00:00
Felipe Leme
556ac231e9 Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev 
am: fb5995cfbb

Change-Id: I5f649b54038b586be375394d35fd34453213df0a
 2016-06-08 20:20:41 +00:00
Alan Viverette
8042dd846a Merge \\\"Return correct default theme on API >= 24\\\" into nyc-dev am: afaa1e9db1 am: 1bb283131f 
am: af2f098c8c

Change-Id: I5cbd140458a6fa354551bcfb1a73b0cffcbd8453
 2016-06-08 19:03:43 +00:00
Felipe Leme
5493f0f6a2 Merge \\\"Wrap closeQuietly() on finally block.\\\" into nyc-dev am: fb5995cfbb am: a18a63b23a 
am: ddafe182df

Change-Id: I48de6aee67b4d12c8185e35d5203e1dbb952a502
 2016-06-08 19:03:38 +00:00
Ian Pedowitz
af2f098c8c Merge \\"Return correct default theme on API >= 24\\" into nyc-dev am: afaa1e9db1 
am: 1bb283131f

Change-Id: I2f21175998134e3ac03279307e7d6bb163614ce9
 2016-06-08 18:59:14 +00:00
Felipe Leme
ddafe182df Merge \\"Wrap closeQuietly() on finally block.\\" into nyc-dev am: fb5995cfbb 
am: a18a63b23a

Change-Id: I3e6769579e08887888b1358be0cb695f32e13749
 2016-06-08 18:59:10 +00:00
Alan Viverette
1bb283131f Merge \"Return correct default theme on API >= 24\" into nyc-dev 
am: afaa1e9db1

Change-Id: I620b5682bc4fa9752b1f1bf68d8ed1498db66a5d
 2016-06-08 18:35:22 +00:00
Ian Pedowitz
afaa1e9db1 Merge "Return correct default theme on API >= 24" into nyc-dev 2016-06-08 18:28:00 +00:00
Tianjie Xu
ed18ad5ea2 Merge \\\"Change unit of I/O statistics to MiB\\\" into nyc-dev am: 00681d0e78 am: ebfa28ccf8 
am: d889a0a753

Change-Id: I5ff1d2beda2e36d1d983f893d64672a95f4c2990
 2016-06-08 18:24:25 +00:00
Felipe Leme
a18a63b23a Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev 
am: fb5995cfbb

Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627
 2016-06-08 18:16:43 +00:00
Tianjie Xu
d889a0a753 Merge \\"Change unit of I/O statistics to MiB\\" into nyc-dev am: 00681d0e78 
am: ebfa28ccf8

Change-Id: I0dcd9c8429146f14725f618573b425d103958838
 2016-06-08 18:13:56 +00:00
Tianjie Xu
aebec60aa9 Merge \"Change unit of I/O statistics to MiB\" into nyc-dev 
am: 00681d0e78

Change-Id: I14500524ede93f736d8e6b0ddcc71bd2aa709648
 2016-06-08 18:08:50 +00:00
Tianjie Xu
ebfa28ccf8 Merge \"Change unit of I/O statistics to MiB\" into nyc-dev 
am: 00681d0e78

Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696
 2016-06-08 18:04:32 +00:00
TreeHugger Robot
fb5995cfbb Merge "Wrap closeQuietly() on finally block." into nyc-dev 2016-06-08 17:59:48 +00:00
Tianjie Xu
00681d0e78 Merge "Change unit of I/O statistics to MiB" into nyc-dev 2016-06-08 17:25:16 +00:00
Makoto Onuki
c4e64bc449 Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006 
am: a3a56ab9d1

Change-Id: Id5e39a35db803223a89100a8e23a7b3309cd9dd3
 2016-06-08 17:23:34 +00:00
Makoto Onuki
a3a56ab9d1 Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev 
am: 3bb4366006

Change-Id: Ic2adc036d256a0ad3da4f65a20edfc4cdeb30447
 2016-06-08 17:11:55 +00:00
Makoto Onuki
3bb4366006 Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev 2016-06-08 17:00:00 +00:00
Felipe Leme
c74972f891 Wrap closeQuietly() on finally block. 
BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
 2016-06-08 09:12:37 -07:00
Alan Viverette
4b2b615669 Return correct default theme on API >= 24 
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.

Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
 2016-06-08 11:45:15 -04:00
George Mount
413739e8c6 Re-add Internal API for cross-task Activity used by assistant. 
Bug: 29091742

This reverts commit 563df3b328.

This also fixes the problems experienced by b/29128683.

Change-Id: I8e3d485cb818ea9e03ca475cba88934f6f903f11
 2016-06-08 07:13:37 -07:00
Bart Sears
7d462b987f Fix the build 
Remove duplicate lines (most likely added by auto-merger).

Change-Id: Ib0d90012a40e83f7b9a1fd0001dfeb6f3b56ff1a
 2016-06-08 00:44:47 -07:00
Phil Weaver
eba594fa1b Merge \\\"Revert \\\"Improve accessibility window title behavior\\\"\\\" into nyc-dev am: fc71309640 am: 2c8099110e 
am: d06094dd86

Change-Id: I9da39b5bbd28592f7babe17f3aff4142e04f2e47
 2016-06-08 02:31:16 +00:00
Phil Weaver
d06094dd86 Merge \\"Revert \\"Improve accessibility window title behavior\\"\\" into nyc-dev am: fc71309640 
am: 2c8099110e

Change-Id: Id615a721b788760b54754355414fe9762d65f0ab
 2016-06-08 02:27:41 +00:00
Phil Weaver
2c8099110e Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev 
am: fc71309640

Change-Id: Ia2728037f9e610dd49db2bd1a22fd72690bd5340
 2016-06-08 02:24:47 +00:00
Phil Weaver
5c32d65e78 Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev 
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22
 2016-06-08 02:24:42 +00:00
Phil Weaver
fc71309640 Merge "Revert "Improve accessibility window title behavior"" into nyc-dev 2016-06-08 02:19:34 +00:00
Chong Zhang
25007ec4df Merge \"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\" into nyc-dev am: 723e5afa9e am: 1895addcef\" into nyc-mr1-dev-plus-aosp 
am: c6a520e090

Change-Id: If5550e5db119b201228c391e049d54f3760cca31
 2016-06-08 01:31:18 +00:00
Felipe Leme
61da879b9c Merge \\"Added a getPrimaryStorageSize() method.\\" into nyc-mr1-dev am: ba3676460a 
am: 02e2d72d55

Change-Id: I71a1554683697b5b6dde0c47bc2a4464b56b691b
 2016-06-08 01:31:14 +00:00
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
52c6239369 Merge \\\"Duplicate file descriptor when dumping asynchronously.\\\" into nyc-dev am: c02ba17898 am: 9d178342d8 
am: 3b37c224b5

Change-Id: Icea29e406cc99266f6b1c26a6cd850de56c25ae0
 2016-06-08 01:26:14 +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
Android Build Merger (Role)
22eaf715a1 Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev 2016-06-08 01:23:04 +00:00
Chong Zhang
5c689127ba Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev 
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
 2016-06-08 01:22:43 +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
TreeHugger Robot
c02ba17898 Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev 2016-06-08 01:08:42 +00:00
Siyamed Sinir
a4cbaa30e1 Merge \\\"Fix int overflow in SpannableStringBuilder.replace\\\" into nyc-dev am: 96c3e5504b am: 9eddf7ae8e 
am: bb05c332b1

Change-Id: I3ff5cb7dbf6ceccf212d65fcb8b06eb5c087cc5e
 2016-06-08 00:59:49 +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
Tianjie Xu
a2fe5517bc Change unit of I/O statistics to MiB 
I/O in bytes are too large and it may cause overflow. Moreover, data with
large numbers are grouped in the same bucket of the histogram. This adds
difficulty to the analysis. Changing unit of I/O to MiB so that we can
have a better data distribution.

Bug: 28658632
Change-Id: Id9913d71e62b36ce5d5d2e57676953f4dbd0c7c9
 2016-06-07 17:54:48 -07: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