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

65724 Commits

Author SHA1 Message Date
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
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
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
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
Lorenzo Colitti
3feff1367b Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev 
am: 3e2bfbd135

Change-Id: I2305c4019f56896d741caa509df41416368e5642
 2016-06-08 06:39:18 +00:00
TreeHugger Robot
3e2bfbd135 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev 
* changes:
  Give WakeupMessage the ability to transport an object as well.
  Don't treat the lingerExpired broadcast specially.
  Add a test for mobile data always on.
  Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
 2016-06-08 06:35:32 +00:00
Lorenzo Colitti
eab17da588 Give WakeupMessage the ability to transport an object as well. 
Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
 2016-06-08 14:11:52 +09: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
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
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
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
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
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
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
Phil Weaver
266ed9acc3 Revert "Improve accessibility window title behavior" 
Bug: 29127065

This reverts commit 2a7e4442bf.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
 2016-06-08 00:34:40 +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
Felipe Leme
18202e00bd Added a getPrimaryStorageSize() method. 
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **
 2016-06-07 16:42:35 -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
Makoto Onuki
157b1628fd ShortcutManager: deal with changing resource IDs on app update 
- When an app is upgraded, all the resource IDs may change.  So
if a shortcut is previously published with an icon for res ID 100
and the publisher is upgraded, resource #100 may refer to something
different.

- So now the service also remembers resource names for icon resources,
as wells as string resources.  When an app is updated, the service
fetch the updated resource IDs by name.

- Also extract all string resources when a shortcut is published
and persist them, so that even when the original string resources are
removed from the app, the launcher can still show the extracted strings.

- When the system locale changes, re-extract all string resources.

- Also really hide the constants in ShortcutInfo that were
accidentally made public.

Change-Id: I23c29b45c1de5d76175229190a1533c9c62c5960
 2016-06-07 16:11:30 -07: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
Esteban Talavera
9bf7bd1728 Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4df3 
am: cc12064670

* commit 'cc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8':
  Fix getApplicationRestrictions documentation

Change-Id: I7715a46ef865e3e4e936c2baea5e6c52e4783e8d
 2016-06-07 18:03:32 +00:00
Esteban Talavera
36ff488bb4 Merge "Fix getApplicationRestrictions documentation" into nyc-dev 
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Idaab3c8f765d5e5631aa69557a9c3f194c9d5d33
 2016-06-07 17:59:02 +00:00
Esteban Talavera
cc12064670 Merge "Fix getApplicationRestrictions documentation" into nyc-dev 
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
 2016-06-07 17:59:01 +00:00
Esteban Talavera
953fe48329 Fix getApplicationRestrictions documentation 
The method never returns null, only empty bundle

Bug: 29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689
 2016-06-07 17:21:49 +01:00
Eino-Ville Talvala
abb7488998 Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 
am: fe3ecdab1b

* commit 'fe3ecdab1b461d811825ce363d7041f3c8c120c3':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: If16a43f4a17e71cc12ed7c912ed5e6a46c85e56c
 2016-06-06 23:50:36 +00:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant." 
This reverts commit 04073dc5be.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
 2016-06-06 22:04:54 +00:00
fionaxu
2581d13f25 Merge "cold sim clean up" into nyc-mr1-dev 
am: ba3428f01b

* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
  cold sim clean up

Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
 2016-06-04 05:53:44 +00:00