Nicolas Geoffray
3d02cf4c21
Merge "Drop REASON_NON_SYSTEM_LIBRARY." into oc-dev
...
am: 8d68694951
2017-03-30 16:39:04 +00:00
George Mount
be99bf2cd4
Merge "Fix getting wrong instance when restoring non-config" into oc-dev
...
am: 8386603230
2017-03-30 16:33:35 +00:00
Nicolas Geoffray
8d68694951
Merge "Drop REASON_NON_SYSTEM_LIBRARY." into oc-dev
2017-03-30 16:32:38 +00:00
TreeHugger Robot
8386603230
Merge "Fix getting wrong instance when restoring non-config" into oc-dev
2017-03-30 16:27:41 +00:00
Geoffrey Pitsch
8637cbeac5
Merge "Wait to unlock before changing notification importance" into oc-dev
...
am: a07ce03d3c
2017-03-30 16:18:03 +00:00
TreeHugger Robot
a07ce03d3c
Merge "Wait to unlock before changing notification importance" into oc-dev
2017-03-30 16:14:03 +00:00
Makoto Onuki
60e6e538f9
Merge "Show user running state in dumpsys user." into oc-dev
...
am: 2692dafa9b
2017-03-30 15:23:56 +00:00
Makoto Onuki
2692dafa9b
Merge "Show user running state in dumpsys user." into oc-dev
2017-03-30 15:18:28 +00:00
Nicolas Geoffray
31f7a2859b
Merge "Drop REASON_CORE_APP." into oc-dev
...
am: f451f7b05b
2017-03-30 14:01:36 +00:00
Geoffrey Pitsch
5278d3d38c
Wait to unlock before changing notification importance
...
Test: runtest systemui
Change-Id: I66614de96e0a5c725ac6f6e7b76f64b39326ba6b
Fixes: 36264464
2017-03-30 09:55:51 -04:00
Nicolas Geoffray
de0272b85c
Drop REASON_NON_SYSTEM_LIBRARY.
...
Dexopt them with the same "mode" as the apk we are
going to dexopt. Because we treat them as shared, this
means they are only going to be fully compiled once an app
that has it in its <uses-library> gets compiled.
bug:33799337
Test: m -j32 && boot
Change-Id: Ic93fbcf45be6b9cf31ad3a3eb498f9fbbefeb288
(cherry picked from commit 90978b4159
2017-03-30 13:55:10 +00:00
Nicolas Geoffray
f451f7b05b
Merge "Drop REASON_CORE_APP." into oc-dev
2017-03-30 13:54:33 +00:00
Diego Perez
cd190037af
Merge "Handle the case where no session exists" into oc-dev
...
am: 261dd2305a
2017-03-30 13:30:17 +00:00
TreeHugger Robot
261dd2305a
Merge "Handle the case where no session exists" into oc-dev
2017-03-30 13:27:00 +00:00
Diego Perez
510916c13f
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev
...
am: 3134462c5e
2017-03-30 13:17:29 +00:00
Diego Perez
3134462c5e
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev
2017-03-30 13:12:39 +00:00
Nicolas Geoffray
30f18587e3
Drop REASON_CORE_APP.
...
After ensuring apps used by system server are speed compiled
on /system, we don't need a special reason anymore.
bug:36532541
bug:33799337
Test: m -j32 && boot
Change-Id: I1fb894f0f5b796cb9d59ed01a4afb2709c0f5496
(cherry picked from commit b70e4bfe07
2017-03-30 11:55:26 +00:00
Wale Ogunwale
860732e495
Merge "Correctly blame ANR on process using another process token" into oc-dev
...
am: 921daeed2f
2017-03-30 11:30:19 +00:00
TreeHugger Robot
921daeed2f
Merge "Correctly blame ANR on process using another process token" into oc-dev
2017-03-30 11:25:08 +00:00
Diego Perez
a55b3ba642
Handle the case where no session exists
...
In some cases, if an error happens, no session will exist in
BridgeRenderSession.
Test: Added small regression test
Change-Id: Ic9be381767626766395c65044542c197ed7649e7
2017-03-30 12:21:07 +01:00
Diego Perez
d88c717b4e
Make layoutlib more lenient with recoverable errors
...
In many cases, throwing an exception will stop the inflation or
rendering of a layout. Sometimes, we could recover from some of the
failures and render a layout that is "usable".
I've done a first pass trying to follow the following rules:
- Try simple recoveries by choosing sensible defaults. Not trying
complex recoveries.
- Only recover if the exception is not part of the class behaviour.
Avoided removing declared exceptions or exceptions that are expected by
the framework.
- I've kept assertions in place so, in most cases, the behaviour will
be almost identical to the previous one with assertions enabled.
Test: Checked with existing tests
Change-Id: I0001fdd3c808cf405c4eb8d734b9bbe63493e05c
2017-03-30 12:07:28 +01:00
Sudheer Shanka
abed833af1
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
...
am: 8c85b1d0b7
2017-03-30 07:43:32 +00:00
Sudheer Shanka
8c85b1d0b7
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
2017-03-30 07:38:09 +00:00
Nathan Harold
949d1353e9
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971 am: 6d3c10495e
...
am: 81d48a99e0
2017-03-30 03:48:20 +00:00
Sudheer Shanka
ed25ce6d59
Fix flaky tests in NetworkPolicyManagerServiceTest.
...
Test: runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I0a6f0d11e3922bfeb2bd3784f23e10ae45e5e40c
2017-03-29 20:46:30 -07:00
Nathan Harold
81d48a99e0
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971
...
am: 6d3c10495e
2017-03-30 03:44:12 +00:00
Nathan Harold
6d3c10495e
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
...
am: d118826971
2017-03-30 03:39:46 +00:00
Jakub Pawlowski
f96f05b108
Merge "Hide periodic scanning" am: ca7544ea15 am: c06722e788
...
am: c809a5b12b
2017-03-30 03:35:53 +00:00
Treehugger Robot
d118826971
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
2017-03-30 03:33:13 +00:00
Jakub Pawlowski
c809a5b12b
Merge "Hide periodic scanning" am: ca7544ea15
...
am: c06722e788
2017-03-30 03:30:42 +00:00
Jakub Pawlowski
c06722e788
Merge "Hide periodic scanning"
...
am: ca7544ea15
2017-03-30 03:26:18 +00:00
Jakub Pawlowski
ca7544ea15
Merge "Hide periodic scanning"
2017-03-30 03:17:49 +00:00
Michael Plass
1a322e7d14
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev
...
am: 859789061f
2017-03-30 03:05:12 +00:00
TreeHugger Robot
859789061f
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev
2017-03-30 02:58:41 +00:00
Ta-wei Yen
904e1856a7
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
...
am: dfbc8517ee
2017-03-30 01:58:40 +00:00
TreeHugger Robot
dfbc8517ee
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
2017-03-30 01:51:56 +00:00
Romain Guy
6869c55106
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
...
am: 33813bd439
2017-03-30 01:48:42 +00:00
Romain Guy
33813bd439
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
2017-03-30 01:42:32 +00:00
Bill Yi
bcd06fab1d
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 5acdc8c3d5
2017-03-30 01:40:45 +00:00
George Mount
b81f36bb72
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
...
am: ce3cf36652
2017-03-30 01:37:30 +00:00
TreeHugger Robot
5acdc8c3d5
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-03-30 01:30:09 +00:00
TreeHugger Robot
ce3cf36652
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
2017-03-30 01:26:13 +00:00
Pavlin Radoslavov
7a776f03a1
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
...
am: 4e7bc119ae
2017-03-30 01:22:32 +00:00
TreeHugger Robot
4e7bc119ae
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
2017-03-30 01:17:23 +00:00
Evan Rosky
f99eb172ae
Merge "Expose initial focus feature flag for testing" into oc-dev
...
am: 7ac3fb2282
2017-03-30 01:10:25 +00:00
Evan Rosky
7ac3fb2282
Merge "Expose initial focus feature flag for testing" into oc-dev
2017-03-30 01:02:28 +00:00
Nathan Harold
c4f879925b
Change reserveSecurityParameterIndex() to take a remoteAddress
...
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.
Bug: 36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
2017-03-29 17:46:47 -07:00
Abhijith Shastry
c8d771593a
Merge "Update injectSmsPdu documentation." into oc-dev
...
am: 13dbbaf50a
2017-03-30 00:40:30 +00:00
Adam Lesinski
719349cdb3
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
...
am: c26ace0754
2017-03-30 00:36:24 +00:00
TreeHugger Robot
13dbbaf50a
Merge "Update injectSmsPdu documentation." into oc-dev
2017-03-30 00:36:01 +00:00
