Alex Naidis
32dfe8c611
Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844
...
am: edca8aa3a8
2017-01-09 17:09:31 +00:00
Alex Naidis
edca8aa3a8
Merge "StorageManager: Improve exception handling" am: cf3a4a68bd
...
am: 545cf37844
2017-01-09 17:04:32 +00:00
Alex Naidis
545cf37844
Merge "StorageManager: Improve exception handling"
...
am: cf3a4a68bd
2017-01-09 16:59:56 +00:00
Alex Naidis
19d9c2d03c
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 >
2017-01-09 16:27:52 +00:00
Nick Kralevich
4429993d78
Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87
...
am: a63462c794
2017-01-08 15:09:21 +00:00
Nick Kralevich
a63462c794
Merge "Dumps total size of primary storage." am: 55dc66dde4
...
am: 12b387dd87
2017-01-08 15:04:54 +00:00
Nick Kralevich
12b387dd87
Merge "Dumps total size of primary storage."
...
am: 55dc66dde4
2017-01-08 15:00:18 +00:00
Felipe Leme
c0d3f0ed52
Dumps total size of primary storage.
...
BUG: 32069168
Test: manual verification
(cherry picked from commit 281389ac54
2017-01-08 03:51:37 +01:00
Dave Friedman
5346355f4d
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0 am: eedb695579
...
am: fb8676e50c
2017-01-07 02:58:15 +00:00
Dave Friedman
fb8676e50c
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b am: a111e0f7f0
...
am: eedb695579
2017-01-07 02:50:18 +00:00
Dave Friedman
eedb695579
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe am: e0fd4c8a3b
...
am: a111e0f7f0
2017-01-07 02:43:44 +00:00
Dave Friedman
a111e0f7f0
Docs: Updates Javadoc documentation. Bug: 32532540 am: 2a3ebadcbe
...
am: e0fd4c8a3b
2017-01-07 02:38:45 +00:00
Dave Friedman
e0fd4c8a3b
Docs: Updates Javadoc documentation. Bug: 32532540
...
am: 2a3ebadcbe
2017-01-07 02:30:45 +00:00
Dave Friedman
2a3ebadcbe
Docs: Updates Javadoc documentation.
...
Bug: 32532540
Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
2017-01-06 16:41:19 -08:00
Ruchi Kandoi
bbc00c877f
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
...
am: c1db6c05d0
2017-01-06 19:10:22 +00:00
Ruchi Kandoi
c1db6c05d0
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
...
am: 388980d88f
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
...
am: cc4203221b
2017-01-06 18:58:17 +00:00
Ruchi Kandoi
104e0b4399
nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
...
Bug: 32881476
Test: Manual; backup, change settings, restore
Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2017-01-06 18:48:51 +00:00
TreeHugger Robot
414f8fbdbb
Merge "resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2017-01-06 10:40:36 +00:00
Ajay Panicker
af525ff403
Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1
...
am: e0211af867
2017-01-06 01:50:03 +00:00
Ajay Panicker
e0211af867
Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53
...
am: d76576b6d1
2017-01-06 01:46:10 +00:00
Ajay Panicker
d76576b6d1
Merge "Prevent LocalSocket from creating an fd if fd is already there"
...
am: 616910fd53
2017-01-06 01:41:09 +00:00
Treehugger Robot
616910fd53
Merge "Prevent LocalSocket from creating an fd if fd is already there"
2017-01-06 01:29:47 +00:00
Steven Moreland
4d3caf3938
Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca am: 3290ba072b
...
am: 94924f38fb
2017-01-06 01:16:02 +00:00
Steven Moreland
94924f38fb
Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca
...
am: 3290ba072b
2017-01-06 01:09:26 +00:00
Steven Moreland
3290ba072b
Merge "HwBinder: get/register checked exceptions."
...
am: 9ec4fec5ca
2017-01-06 01:05:02 +00:00
Treehugger Robot
9ec4fec5ca
Merge "HwBinder: get/register checked exceptions."
2017-01-06 00:58:17 +00:00
TreeHugger Robot
9b89e5b02c
Merge "resolve merge conflicts of cb29c97907 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
2017-01-06 00:42:35 +00:00
Amin Shaikh
ea7931d107
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 am: 7495cf633c
...
am: d7f371813a
2017-01-06 00:21:56 +00:00
Amin Shaikh
d7f371813a
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4
...
am: 7495cf633c
2017-01-06 00:15:01 +00:00
Alain Vongsouvanh
c89202e177
resolve merge conflicts of cb29c97907 to nyc-mr2-dev-plus-aosp
...
Change-Id: I22ff2e61c0d46310e62fa45f98e11a5bba3d5f1a
2017-01-05 16:11:25 -08:00
Amin Shaikh
7495cf633c
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
...
am: 48eecdcbc4
2017-01-06 00:08:19 +00:00
Treehugger Robot
48eecdcbc4
Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
2017-01-05 23:57:54 +00:00
Ajay Panicker
7a8c36aa4e
Prevent LocalSocket from creating an fd if fd is already there
...
Any LocalSocket created with a FileDescriptor will throw IOExceptions
when performing most opperations due to the fact that the LocalSocket
tries to create an implementation but fails since there is a FileDescriptor
already set.
Bug: 34095140
Test: Setup using tap&go
Change-Id: Ie8f50def6156c16617697d939d6c0ab570281642
2017-01-05 23:52:30 +00:00
Alain Vongsouvanh
5549258eea
resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp
...
Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
2017-01-05 15:27:37 -08:00
Amin Shaikh
2cd918a63e
Fix NetworkScorerAppManager#isCallerActiveScorer.
...
The current implementation checks whether the caller's uid has the
SCORE_NETWORKS permission instead of checking the passed in callingUid. I
removed this check entirely because the getActiveScorer method already checks
whether the scorer's package has the SCORE_NETWORKS permission. There is no way
callingUid can equal the active scoring package's uid without also having the
SCORE_NETWORKS permission.
Bug: 34107721
Test: runtest --path core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java
Change-Id: Ifd427792169837c84a10a76b208c76137db06ae9
2017-01-05 14:28:47 -08:00
Alain Vongsouvanh
cb29c97907
widget: Adding support for custom LockPatternView.
...
am: 2fda2ce159
2017-01-05 19:45:02 +00:00
Steven Moreland
c0631d0bb7
HwBinder: get/register checked exceptions.
...
Bug: 33673120
Test: hidl_test_java
Change-Id: Id19b61b252e756a032ae11f7b59bd8eed82edbe9
2017-01-05 09:20:44 -08:00
Alain Vongsouvanh
2fda2ce159
widget: Adding support for custom LockPatternView.
...
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
* lockscreen_notselected: asset to display when a cell has not been selected.
* lockscreen_selected: asset to display when a cell has been selected.
BUG: 33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
2017-01-05 16:16:49 +00:00
Robert Sesek
8be4cfc638
Merge "Synchronize access to WebViewZygote." am: fd6f631de5 am: c8111e07d0
...
am: 2c3818158a
2017-01-05 09:43:53 +00:00
Robert Sesek
2c3818158a
Merge "Synchronize access to WebViewZygote." am: fd6f631de5
...
am: c8111e07d0
2017-01-05 09:37:32 +00:00
Robert Sesek
c8111e07d0
Merge "Synchronize access to WebViewZygote."
...
am: fd6f631de5
2017-01-05 09:31:24 +00:00
Treehugger Robot
fd6f631de5
Merge "Synchronize access to WebViewZygote."
2017-01-05 09:21:00 +00:00
Pavlin Radoslavov
01be004c72
Merge "Integration of the LDAC codec for A2DP source" am: 3c050268f0 am: bb8f1cd92b
...
am: 7d14914239
2017-01-05 07:59:59 +00:00
Pavlin Radoslavov
7d14914239
Merge "Integration of the LDAC codec for A2DP source" am: 3c050268f0
...
am: bb8f1cd92b
2017-01-05 07:55:27 +00:00
Pavlin Radoslavov
bb8f1cd92b
Merge "Integration of the LDAC codec for A2DP source"
...
am: 3c050268f0
2017-01-05 07:49:49 +00:00
Pavlin Radoslavov
546866988a
Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b am: a750c90ac1
...
am: 5aaa985e97
2017-01-05 02:12:04 +00:00
Pavlin Radoslavov
fad8b730d2
Integration of the LDAC codec for A2DP source
...
The codec can be used if the encoding shared library is installed
on the device:
libldacBT_enc.so
Test: A2DP streaming to LDAC headsets
Bug: 30958229
Change-Id: I524805fd308b5181427515617eda05625a7c4ae5
2017-01-04 18:07:29 -08:00
Pavlin Radoslavov
5aaa985e97
Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b
...
am: a750c90ac1
2017-01-05 02:07:05 +00:00
Pavlin Radoslavov
a750c90ac1
Merge "Integration of the aptX and aptX-HD codecs for A2DP source"
...
am: 5242acbd0b
2017-01-05 02:02:01 +00:00
