OSDN Git Service
Bill Yi [Tue, 10 Jan 2017 07:19:28 +0000 (07:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
0ffe43ecd7 -s ours
Change-Id: I06a438a8cf7de8effc3d62912c1bf8761ad08d59
Bill Yi [Tue, 10 Jan 2017 07:19:24 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE
am:
4fcf5b1813 -s ours
Change-Id: Ie1da6f2d65250668afc630ccbfa61b7531c2721e
TreeHugger Robot [Tue, 10 Jan 2017 07:12:11 +0000 (07:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Jeff Sharkey [Tue, 10 Jan 2017 04:47:47 +0000 (04:47 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172 am:
7beb2b75a9
am:
669affdb8e
Change-Id: I698dd15a397f16dd2358729362860443f7e81a33
Jeff Sharkey [Tue, 10 Jan 2017 04:42:52 +0000 (04:42 +0000)]
Merge "Methods to calculate user and external disk usage." am:
6a9ad14172
am:
7beb2b75a9
Change-Id: I236eb3357b597cac26f5234a72551a471919a411
Jeff Sharkey [Tue, 10 Jan 2017 04:38:15 +0000 (04:38 +0000)]
Merge "Methods to calculate user and external disk usage."
am:
6a9ad14172
Change-Id: Ie4ab045a5425b35ce1bdd245f7c6ab248c796df2
Jeff Sharkey [Tue, 10 Jan 2017 04:30:46 +0000 (04:30 +0000)]
Merge "Methods to calculate user and external disk usage."
Bill Yi [Tue, 10 Jan 2017 04:05:48 +0000 (20:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idb74740bc5560b78a7b3d3cd7f2d92aee4ba411e
Auto-generated-cl: translation import
John Reck [Tue, 10 Jan 2017 00:49:35 +0000 (00:49 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" am:
f66126c828 am:
620d4c24de
am:
43818c45a4
Change-Id: Ia093688d4c9fc2e923daf5da6d5b6d67c6b56975
John Reck [Tue, 10 Jan 2017 00:44:29 +0000 (00:44 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" am:
f66126c828
am:
620d4c24de
Change-Id: I4fdb8ecba5a08f712871d3b99e0286c61f6d0806
John Reck [Tue, 10 Jan 2017 00:39:28 +0000 (00:39 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
am:
f66126c828
Change-Id: I649478ca7aa33de82a1524dfe9925c0a2d82a7a7
Treehugger Robot [Tue, 10 Jan 2017 00:26:42 +0000 (00:26 +0000)]
Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age"
Sundeep Ghuman [Tue, 10 Jan 2017 00:05:21 +0000 (00:05 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes." am:
e34e47d645 am:
3098d3839f
am:
4962a3829f
Change-Id: Ia3928c4113e8f07969a3d551e31d6307f61e848e
Amin Shaikh [Tue, 10 Jan 2017 00:04:00 +0000 (00:04 +0000)]
Merge "Expose fields in WifiConfiguration." am:
1ea4180c3a am:
ce13838ade
am:
a0961255fc
Change-Id: I1232829112d6f5ba5fa99199555e584c91ae35af
Jeff Sharkey [Mon, 9 Jan 2017 00:06:58 +0000 (17:06 -0700)]
Methods to calculate user and external disk usage.
Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user. Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.
Start measuring internal and external storage space separately; new
GIDs are coming in a future CL. Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.
Test: builds, boots, stats are consistent
Bug:
27948817,
32206268
Change-Id: Icbb82a30fe711ef05e9a16bb1dc740dc943a9ddc
Sundeep Ghuman [Mon, 9 Jan 2017 23:55:47 +0000 (23:55 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes." am:
e34e47d645
am:
3098d3839f
Change-Id: I5f7d741dbd7f91518495f02de995bca6d191aa4e
Amin Shaikh [Mon, 9 Jan 2017 23:54:30 +0000 (23:54 +0000)]
Merge "Expose fields in WifiConfiguration." am:
1ea4180c3a
am:
ce13838ade
Change-Id: Ia391a1b115646ad0409c5b52fee664d42901dd18
Sundeep Ghuman [Mon, 9 Jan 2017 23:51:07 +0000 (23:51 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."
am:
e34e47d645
Change-Id: Ibeb6c60c30c302e12c45c7f35a7e4af904a4a6d5
Amin Shaikh [Mon, 9 Jan 2017 23:45:15 +0000 (23:45 +0000)]
Merge "Expose fields in WifiConfiguration."
am:
1ea4180c3a
Change-Id: I6a145981692cbaf791b735d55a1a9b7aa24aee62
Treehugger Robot [Mon, 9 Jan 2017 23:39:47 +0000 (23:39 +0000)]
Merge "Cherrypick: Create ScoredNetwork Badging API changes."
Treehugger Robot [Mon, 9 Jan 2017 23:33:24 +0000 (23:33 +0000)]
Merge "Expose fields in WifiConfiguration."
Jack Yu [Mon, 9 Jan 2017 23:24:54 +0000 (23:24 +0000)]
Merge "Moved implicit intents into explicit intents" am:
ccda81e58f am:
b7db5ac6d8 -s ours
am:
8679758cee -s ours
Change-Id: Ic388f1ca1b3c2e65b88f60eefa87a7c6f63fcf86
Jack Yu [Mon, 9 Jan 2017 23:19:55 +0000 (23:19 +0000)]
Merge "Moved implicit intents into explicit intents" am:
ccda81e58f
am:
b7db5ac6d8 -s ours
Change-Id: I13a65c3d132c465b43baa64d195ce9f03f96e167
Android Build Merger (Role) [Mon, 9 Jan 2017 23:18:20 +0000 (23:18 +0000)]
Merge "Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am:
9f60453361 -s ours am:
f22b197e08 -s ours" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 9 Jan 2017 23:17:37 +0000 (23:17 +0000)]
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
4ebbea26cc" into nyc-mr2-dev-plus-aosp
Jack Yu [Mon, 9 Jan 2017 23:17:36 +0000 (23:17 +0000)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am:
9f60453361 -s ours
am:
f22b197e08 -s ours
Change-Id: If6819bb182a58a24a15bbbcfc08a4ecf3684e5e4
Android Build Merger (Role) [Mon, 9 Jan 2017 23:17:14 +0000 (23:17 +0000)]
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01 am:
a95e7a2be7" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 9 Jan 2017 23:16:41 +0000 (23:16 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01
am:
4ebbea26cc
Change-Id: I48f67ac1a8f54529bd4a37770fc1c35dc7cabb6d
Michael Kwan [Mon, 9 Jan 2017 23:16:27 +0000 (23:16 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am:
6d7dc11e01
am:
a95e7a2be7
Change-Id: I290cf138b577deb8d2f70ca22a4107be4abb186a
Android Build Merger (Role) [Mon, 9 Jan 2017 23:16:11 +0000 (23:16 +0000)]
Merge "Check if the activity translucency was converted before converted back. am:
39dd370d8e am:
fe9e68a63c" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 9 Jan 2017 23:15:28 +0000 (23:15 +0000)]
Check if the activity translucency was converted before converted back. am:
39dd370d8e
am:
fe9e68a63c
Change-Id: I7df6d29f1b26afaed2da8da4e645447ebd38a7f9
Michael Kwan [Mon, 9 Jan 2017 23:15:23 +0000 (23:15 +0000)]
Check if the activity translucency was converted before converted back. am:
39dd370d8e
am:
898385ed59
Change-Id: I5bee496498ebcff712184f417adfdf8ee5436e7d
Jack Yu [Mon, 9 Jan 2017 23:11:23 +0000 (23:11 +0000)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
am:
9f60453361 -s ours
Change-Id: I20385bd6216925de59d6ea2ac107b04e374b03b7
Jack Yu [Mon, 9 Jan 2017 23:10:55 +0000 (23:10 +0000)]
Merge "Moved implicit intents into explicit intents"
am:
ccda81e58f
Change-Id: I90ccdbceba9492f95c658a7fabd113a35dcc8ae2
Michael Kwan [Mon, 9 Jan 2017 23:06:25 +0000 (23:06 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
am:
6d7dc11e01
Change-Id: I1ad11517c50cda3b37d3193ace983bb8b1a58c36
Michael Kwan [Mon, 9 Jan 2017 23:06:24 +0000 (23:06 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
am:
6d7dc11e01
Change-Id: I1331dadb63009eb7acf693b59f16aebe1557d51e
Michael Kwan [Mon, 9 Jan 2017 23:06:22 +0000 (23:06 +0000)]
Check if the activity translucency was converted before converted back.
am:
39dd370d8e
Change-Id: Ibf6e7b3a1d2767c91cca402fabcc1a0a3616733e
Michael Kwan [Mon, 9 Jan 2017 23:06:21 +0000 (23:06 +0000)]
Check if the activity translucency was converted before converted back.
am:
39dd370d8e
Change-Id: Ib0705da70acd8abceedd5c1deeacae5023032543
TreeHugger Robot [Mon, 9 Jan 2017 22:59:50 +0000 (22:59 +0000)]
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
Joe Onorato [Mon, 9 Jan 2017 22:52:53 +0000 (22:52 +0000)]
Hold a wake lock while DeviceIdleController is going idle. am:
b08db484c2
am:
e678f29684
Change-Id: I130a3b997915d6edf716d82cb614abb4b21ea7c3
Joe Onorato [Mon, 9 Jan 2017 22:47:52 +0000 (22:47 +0000)]
Hold a wake lock while DeviceIdleController is going idle. am:
b08db484c2
am:
1046331f89
Change-Id: I229ab30185b793a1a8773e73c878347468a12814
Joe Onorato [Mon, 9 Jan 2017 22:43:46 +0000 (22:43 +0000)]
Hold a wake lock while DeviceIdleController is going idle.
am:
b08db484c2
Change-Id: I12a3f0a0edc1d8393267ef1ab34b650a7c1036f2
Joe Onorato [Mon, 9 Jan 2017 22:43:24 +0000 (22:43 +0000)]
Hold a wake lock while DeviceIdleController is going idle.
am:
b08db484c2
Change-Id: I7a1d1ea87541de8f0e12d687440efccc8956a5c1
John Reck [Tue, 27 Sep 2016 21:45:28 +0000 (14:45 -0700)]
Support EGL_KHR_partial_update without EGL_EXT_buffer_age
Bug:
31334677
Test: manual && hwuimacro --onscreen partialdamage
Change-Id: I9b346b4053ec12c8a78a143a4dc0e708c44888a2
Jack Yu [Mon, 9 Jan 2017 22:33:12 +0000 (14:33 -0800)]
Merge commit '
5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
Treehugger Robot [Mon, 9 Jan 2017 22:02:36 +0000 (22:02 +0000)]
Merge "Moved implicit intents into explicit intents"
Michael Kwan [Mon, 9 Jan 2017 21:43:52 +0000 (13:43 -0800)]
Check if the activity translucency was converted before converted back.
Bug:
34084490
Change-Id: Ib04c76549a31c7e523649f9d284637d44d7477ae
Joe Onorato [Fri, 9 Dec 2016 01:48:49 +0000 (17:48 -0800)]
Hold a wake lock while DeviceIdleController is going idle.
The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it. But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.
It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.
Bug:
31900521
Test: adb shell dumpsys deviceidle step ... adb shell dumpsys power has no wakelocks held
Change-Id: I799f45221a6b327e7f63745cadc95ca644c064c6
(cherry picked from commit
8f0e9cede145bbc1668e25cfd6f850fe3fde3ae3)
Jeremy Joslin [Mon, 9 Jan 2017 21:18:26 +0000 (21:18 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only." am:
1f89f3d1da am:
99b73c61f2
am:
542f906448
Change-Id: I55dc42d95816e0edd2c570fe96dc724c180a3cd1
Jeremy Joslin [Mon, 9 Jan 2017 21:17:17 +0000 (21:17 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
4c456d7ddf am:
542aad4c75
am:
f91d9debef
Change-Id: I7436278fa3eab064fe2b416c672bedaa300eb501
Jeremy Joslin [Mon, 9 Jan 2017 21:09:09 +0000 (21:09 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only." am:
1f89f3d1da
am:
99b73c61f2
Change-Id: I5959ba9a45dd3c895421b131fd34db6b37c6e405
Jeremy Joslin [Mon, 9 Jan 2017 21:07:48 +0000 (21:07 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
4c456d7ddf
am:
542aad4c75
Change-Id: I3b35ec04e65f6b14f75f266dfcf15c10a12a4d74
Jeremy Joslin [Mon, 9 Jan 2017 21:00:13 +0000 (21:00 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only."
am:
1f89f3d1da
Change-Id: I4fff314194584e78c86e3b0ae1de40fd7f2501f4
Jeremy Joslin [Mon, 9 Jan 2017 20:58:50 +0000 (20:58 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am:
4c456d7ddf
Change-Id: I441cae5096b922419763832d5b38faa95818e337
Jack Yu [Mon, 9 Jan 2017 20:58:24 +0000 (20:58 +0000)]
Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp
am:
ad873323fc
Change-Id: I61f0266d3b98c39448339feada5f4e4f7e94fa61
Jack Yu [Mon, 9 Jan 2017 20:58:15 +0000 (20:58 +0000)]
Moved implicit intents into explicit intents
am:
6356b6e3c7
Change-Id: I39ae9bb2b727ba1f8a9bf49f3f8da03b131207ba
Sundeep Ghuman [Fri, 16 Dec 2016 21:30:45 +0000 (13:30 -0800)]
Cherrypick: Create ScoredNetwork Badging API changes.
Defines an attribute bundles key to hold the badging curve, the
enums for badge values, and an API to retrieve a badge for a
specific RSSI.
OCL: ag/
1727147
Bug:
33457699
Test: Unit tests
Change-Id: If9e8a60c4670b51c395fb501f55ddece8a72981e
Merged-In: If9e8a60c4670b51c395fb501f55ddece8a72981e
Treehugger Robot [Mon, 9 Jan 2017 20:51:33 +0000 (20:51 +0000)]
Merge "Make REQUEST_NETWORK_SCORES signature only."
Treehugger Robot [Mon, 9 Jan 2017 20:45:51 +0000 (20:45 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
TreeHugger Robot [Mon, 9 Jan 2017 20:44:32 +0000 (20:44 +0000)]
Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 9 Jan 2017 19:33:00 +0000 (19:33 +0000)]
Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am:
5df216f209 am:
1831698768" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 9 Jan 2017 19:32:27 +0000 (19:32 +0000)]
Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am:
5df216f209 am:
a7fdfa81b7" into nyc-mr2-dev-plus-aosp
Mark Renouf [Mon, 9 Jan 2017 19:31:59 +0000 (19:31 +0000)]
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am:
5df216f209
am:
1831698768
Change-Id: I9fc68ca4a3c2a2b05e620d7b94cb3e6adef989cd
Mark Renouf [Mon, 9 Jan 2017 19:31:43 +0000 (19:31 +0000)]
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am:
5df216f209
am:
a7fdfa81b7
Change-Id: I002cfe0a272d9a133f751eb0df3ab5d555ebb5af
Android Build Merger (Role) [Mon, 9 Jan 2017 19:31:28 +0000 (19:31 +0000)]
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am:
9b32a35aa7 am:
bf30b430d4" into nyc-mr2-dev-plus-aosp
Jeremy Joslin [Fri, 6 Jan 2017 22:38:57 +0000 (14:38 -0800)]
Make REQUEST_NETWORK_SCORES signature only.
There are no use cases where it's needed by a privileged app today.
Test: Built and ran
BUG:
33752149
Change-Id: Ia63a86eca1f60644d25f037d395a08c541a06a08
Merged-In: Iae689e878fdb60b506536c918079a4fcff527a71
Mark Renouf [Mon, 9 Jan 2017 19:30:38 +0000 (19:30 +0000)]
Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am:
9b32a35aa7
am:
7ef0b07465
Change-Id: I8e6ed26b1109dd3cb293d3a0a2307877fa5e4304
Mark Renouf [Mon, 9 Jan 2017 19:30:37 +0000 (19:30 +0000)]
Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am:
9b32a35aa7
am:
bf30b430d4
Change-Id: I188b3b14f636abbd878c3d35717d5b7702d29a73
Jack Yu [Thu, 5 Jan 2017 23:19:31 +0000 (15:19 -0800)]
Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.
The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver
bug:
33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
Merged-In: I64db3b05400513bacf278ff9f93236495860803e
Mark Renouf [Mon, 9 Jan 2017 19:14:02 +0000 (19:14 +0000)]
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev
am:
5df216f209
Change-Id: I9ad8c851d9c634d26b470456dc07b26e15f61900
Mark Renouf [Mon, 9 Jan 2017 19:13:55 +0000 (19:13 +0000)]
Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN
am:
9b32a35aa7
Change-Id: I99d041ae3a1771e17c94a168cf672f8b73ce572d
Mark Renouf [Mon, 9 Jan 2017 19:13:44 +0000 (19:13 +0000)]
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev
am:
5df216f209
Change-Id: I8ef2a5de5ff83be475c41b1202950bfb953c348f
Mark Renouf [Mon, 9 Jan 2017 19:13:41 +0000 (19:13 +0000)]
Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN
am:
9b32a35aa7
Change-Id: I1576235d933d467963a4522e138036fca3e49891
Jeremy Joslin [Fri, 6 Jan 2017 22:36:54 +0000 (14:36 -0800)]
Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33752149
Change-Id: I3dd352c98bbc34b128ab9c2a28f81e1261ae2669
Merged-In: I7d91fa9a4f6ef4f9170c6af98567ce443c805e74
Mark Renouf [Mon, 9 Jan 2017 19:00:02 +0000 (19:00 +0000)]
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev
Amin Shaikh [Fri, 6 Jan 2017 18:00:33 +0000 (10:00 -0800)]
Expose fields in WifiConfiguration.
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.
Test: make
Bug:
33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
Merged-In: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
Jiaquan He [Mon, 9 Jan 2017 18:03:41 +0000 (18:03 +0000)]
Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
am:
b100a9ac58
Change-Id: I74d039468db01cf1018ab397b94f70b1d517432b
Jiaquan He [Mon, 9 Jan 2017 18:03:34 +0000 (18:03 +0000)]
Force Grid-based Recents to show at most 8 tasks.
am:
883887eac9
Change-Id: I3960939f61acd8834101767481e5cafa7d9aac23
TreeHugger Robot [Mon, 9 Jan 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
Jiaquan He [Fri, 6 Jan 2017 19:53:02 +0000 (11:53 -0800)]
Force Grid-based Recents to show at most 8 tasks.
Bug:
32101881
Bug:
33975969
Change-Id: Icbadaa3ca12f53e57e06dd19d7809a23e0efa88c
Alex Naidis [Mon, 9 Jan 2017 17:09:31 +0000 (17:09 +0000)]
Merge "StorageManager: Improve exception handling" am:
cf3a4a68bd am:
545cf37844
am:
edca8aa3a8
Change-Id: Idbd8b16f0825bdcf48d2013448c767d0966434fe
Alex Naidis [Mon, 9 Jan 2017 17:04:32 +0000 (17:04 +0000)]
Merge "StorageManager: Improve exception handling" am:
cf3a4a68bd
am:
545cf37844
Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4
Alex Naidis [Mon, 9 Jan 2017 16:59:56 +0000 (16:59 +0000)]
Merge "StorageManager: Improve exception handling"
am:
cf3a4a68bd
Change-Id: Id421cb483655dab6d379251d983da2bdcafe598d
Treehugger Robot [Mon, 9 Jan 2017 16:48:35 +0000 (16:48 +0000)]
Merge "StorageManager: Improve exception handling"
Alex Naidis [Wed, 4 Jan 2017 17:52:36 +0000 (18:52 +0100)]
StorageManager: Improve exception handling
When "getPrimaryStorageSize" provides a path
to "readLong", the option that the path
doesn't exist is expected, since it tries
all paths from "INTERNAL_STORAGE_SIZE_PATHS"
until there is success.
This patch makes us catch the "FileNotFoundException"
and "NumberFormatException" seperately.
For the above reason a "FileNotFoundException"
is now treated as an information only.
The "NumberFormatException" and other exceptions
are now treated as error since those are not
expected to happen.
Change-Id: I5316f9c3108e36c31b27dc5df8bf8ac4d4257629
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Jorim Jaggi [Mon, 9 Jan 2017 13:02:51 +0000 (13:02 +0000)]
Merge "Fix message for screen unpinning" into nyc-mr2-dev
am:
b0181b634e
Change-Id: I602c24f1e873386afa6680ab23ed3176463a5f6c
Jorim Jaggi [Mon, 9 Jan 2017 13:02:44 +0000 (13:02 +0000)]
Fix message for screen unpinning
am:
8a28aa54c7
Change-Id: I07d9882251d7de35f785469b13164fd39bce5266
Jorim Jaggi [Mon, 9 Jan 2017 12:52:47 +0000 (12:52 +0000)]
Merge "Fix message for screen unpinning" into nyc-mr2-dev
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:26:12 +0000 (11:26 +0000)]
Merge "Track libcore/jsr-166 update" am:
f6f36d7d9a am:
44cc1f23bf
am:
b9f1b72cb3
Change-Id: I003d0c134c813e06b81922c5fd044d05e7891d38
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:21:46 +0000 (11:21 +0000)]
Merge "Track libcore/jsr-166 update" am:
f6f36d7d9a
am:
44cc1f23bf
Change-Id: Ic9537f84f8210960c98d64891f1267f017186763
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:17:06 +0000 (11:17 +0000)]
Merge "Track libcore/jsr-166 update"
am:
f6f36d7d9a
Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37
Przemyslaw Szczepaniak [Mon, 9 Jan 2017 11:08:34 +0000 (11:08 +0000)]
Merge "Track libcore/jsr-166 update"
Przemyslaw Szczepaniak [Thu, 29 Dec 2016 14:28:51 +0000 (14:28 +0000)]
Track libcore/jsr-166 update
No functional changes.
Update after the switch from custom to openJdk-based implementation of
java.util.concurrent.CopyOnWriteArrayList class.
Tracks libcore commit
29957558cf0db700bfaae360a80c42dc3871d0e5.
Test: make -j 32
Bug:
30860904
Change-Id: I4435bc1fb5ef9fc4ee5f882370073ba8ce2bcfba
Nick Kralevich [Sun, 8 Jan 2017 15:09:21 +0000 (15:09 +0000)]
Merge "Dumps total size of primary storage." am:
55dc66dde4 am:
12b387dd87
am:
a63462c794
Change-Id: I2a62442a581d89054421dd6c44c610fb7ee9a0c4
Nick Kralevich [Sun, 8 Jan 2017 15:04:54 +0000 (15:04 +0000)]
Merge "Dumps total size of primary storage." am:
55dc66dde4
am:
12b387dd87
Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51
Nick Kralevich [Sun, 8 Jan 2017 15:00:18 +0000 (15:00 +0000)]
Merge "Dumps total size of primary storage."
am:
55dc66dde4
Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
Nick Kralevich [Sun, 8 Jan 2017 14:53:08 +0000 (14:53 +0000)]
Merge "Dumps total size of primary storage."
Peter Qiu [Sun, 8 Jan 2017 07:14:30 +0000 (07:14 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am:
b1c9bc5ea5 am:
fdbc827a52
am:
5549acb0e6
Change-Id: I202a51c7d32ecf747fcc32597ac574b5faac2037
Peter Qiu [Sun, 8 Jan 2017 07:06:20 +0000 (07:06 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update" am:
b1c9bc5ea5
am:
fdbc827a52
Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b
Peter Qiu [Sun, 8 Jan 2017 07:00:57 +0000 (07:00 +0000)]
Merge "wifi: hotspot2: Passpoint configuration APIs update"
am:
b1c9bc5ea5
Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
OSDN Git Service
