Adam Lesinski
a24ef02c6b
Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
...
am: 0d25fdd4a8
2016-06-09 03:53:56 +00:00
TreeHugger Robot
0d25fdd4a8
Merge "Throw proper exception in ResourcesManager" into nyc-dev
2016-06-09 03:45:20 +00:00
fionaxu
e285ab3aae
Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
...
am: 0c4f1c7e5c
2016-06-09 02:39:54 +00:00
Adam Lesinski
c82f28a913
Throw proper exception in ResourcesManager
...
In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.
This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.
Bug:28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9
2016-06-08 17:25:35 -07:00
fionaxu
7978147771
resolve merge conflicts of afed6f8 to nyc-dev
...
Bug: 28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
2016-06-08 17:23:09 -07:00
George Mount
963837821a
Fix NPE in startup wizard caused by former change.
...
Bug 29211438
Change-Id: I0c979c945e79a6982d97013f961b00db3c9a9f00
2016-06-08 15:13:52 -07: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
2016-06-08 20:20:44 +00:00
Felipe Leme
556ac231e9
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
...
am: fb5995cfbb
2016-06-08 20:20:41 +00:00
Ian Pedowitz
afaa1e9db1
Merge "Return correct default theme on API >= 24" into nyc-dev
2016-06-08 18:28:00 +00:00
fionaxu
afed6f8631
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
...
am: c10e4fae05
2016-06-08 18:24:16 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
Tianjie Xu
ebfa28ccf8
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
...
am: 00681d0e78
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
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +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
fionaxu
1e8fe12f4e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
am: c196526f8e
2016-06-08 16:58:13 +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
2016-06-08 07:13:37 -07:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
Phil Weaver
5c32d65e78
Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
...
am: fc71309640
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)
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
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
53c1637134
Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
...
am: c02ba17898
2016-06-08 01:15:06 +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
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
9eddf7ae8e
Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
...
am: 96c3e5504b
2016-06-08 00:50:14 +00:00
Siyamed Sinir
96c3e5504b
Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev
2016-06-08 00:46:28 +00:00
Phil Weaver
266ed9acc3
Revert "Improve accessibility window title behavior"
...
Bug: 29127065
This reverts commit 2a7e4442bf
2016-06-08 00:34:40 +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
fionaxu
2c53526b4b
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
...
am: 9a825b0fd5
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5
Backport loadSafeLabel changes am: be2865a60a
...
am: 4c50846519
2016-06-07 23:20:04 +00:00
fionaxu
4c50846519
Backport loadSafeLabel changes
...
am: be2865a60a
2016-06-07 23:13:08 +00: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
fionaxu
be2865a60a
Backport loadSafeLabel changes
...
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Esteban Talavera
cc12064670
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
...
am: a86d6c4df3
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
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
2016-06-06 22:04:54 +00:00
Chen Xu
ba3428f01b
Merge "cold sim clean up" into nyc-mr1-dev
2016-06-04 05:48:47 +00:00
Siyamed Sinir
eb4df8a822
Fix int overflow in SpannableStringBuilder.replace
...
During the offset calculation for selection, SpannableStringBuilder
had an overflow while multiplying two int values. This CL uses long to
calculate the multiplication, and also checks for overflow after
casting the final result into int again.
Bug: 29108549
Change-Id: I11eff4677916701074b38bc5214730fe704707c4
2016-06-03 18:11:45 -07:00
TreeHugger Robot
c27660d45a
Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
2016-06-04 00:22:06 +00:00
