OSDN Git Service
Santos Cordon [Sat, 7 Oct 2017 02:54:06 +0000 (02:54 +0000)]
Merge "Add keyguard state as a gate for VR Mode." into oc-mr1-dev am:
3f58b239a2
am:
b93cdb494a
Change-Id: Ib83b3a1c52977ddda229d3fdf3b55af973a243e1
Santos Cordon [Sat, 7 Oct 2017 02:44:25 +0000 (02:44 +0000)]
Merge "Add keyguard state as a gate for VR Mode." into oc-mr1-dev
am:
3f58b239a2
Change-Id: I6ce4e162a32c89c3dc12cc2d4efcd4186e0fe402
TreeHugger Robot [Sat, 7 Oct 2017 02:37:06 +0000 (02:37 +0000)]
Merge "Add keyguard state as a gate for VR Mode." into oc-mr1-dev
Shubang [Sat, 7 Oct 2017 01:22:28 +0000 (01:22 +0000)]
Merge "Add permissions for LiveTv (AOSP)" into oc-mr1-dev am:
4dc2938418
am:
e13b57b3b9
Change-Id: I91925da75262c8980d27e3e33f5822aa0b4495b4
Shubang [Sat, 7 Oct 2017 01:13:02 +0000 (01:13 +0000)]
Merge "Add permissions for LiveTv (AOSP)" into oc-mr1-dev
am:
4dc2938418
Change-Id: Ic08fbf1610140c9c60d1c91b9960b62304e1d6be
TreeHugger Robot [Sat, 7 Oct 2017 01:02:50 +0000 (01:02 +0000)]
Merge "Add permissions for LiveTv (AOSP)" into oc-mr1-dev
TreeHugger Robot [Sat, 7 Oct 2017 01:02:11 +0000 (01:02 +0000)]
Merge "Adding initial protos for batterystats dump."
Andrew Sapperstein [Sat, 7 Oct 2017 00:48:35 +0000 (00:48 +0000)]
Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev am:
972446cf03
am:
31c0be94ef
Change-Id: I4fca12fbda920b77ae6309e98d5f764ea878b5ce
Andrew Sapperstein [Sat, 7 Oct 2017 00:37:06 +0000 (00:37 +0000)]
Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev
am:
972446cf03
Change-Id: I74706c0f8f2369ff06dc6d9d1d588845edd467b4
TreeHugger Robot [Sat, 7 Oct 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev
Baligh Uddin [Sat, 7 Oct 2017 00:18:21 +0000 (00:18 +0000)]
Merge "Display "No service" on status bar when SIM unready" into oc-mr1-dev-plus-aosp
am:
8a76e3a525
Change-Id: I4f42dce9faf6c23d8a2a7d627632947e09955815
Baligh Uddin [Sat, 7 Oct 2017 00:08:21 +0000 (00:08 +0000)]
Merge "Display "No service" on status bar when SIM unready" into oc-mr1-dev-plus-aosp
Wenting Xiong [Fri, 6 Oct 2017 23:59:18 +0000 (23:59 +0000)]
Merge "Display "No service" on status bar when SIM unready am:
c2b9f772d0 -s ours" into oc-mr1-dev-plus-aosp
am:
144acd75f3
Change-Id: I32ae7adfb46422c6e8ca55172492ed53131a243a
rongliu [Fri, 6 Oct 2017 23:51:49 +0000 (23:51 +0000)]
Merge "Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL as recommended." into oc-mr1-dev am:
bf070a35cd
am:
d6230d3d2a
Change-Id: I914a2a44a0828a6201af79ff467d024bf1460ddd
Android Build Merger (Role) [Fri, 6 Oct 2017 23:46:46 +0000 (23:46 +0000)]
Merge "Display "No service" on status bar when SIM unready am:
c2b9f772d0 -s ours" into oc-mr1-dev-plus-aosp
Wenting Xiong [Fri, 6 Oct 2017 23:45:30 +0000 (23:45 +0000)]
Display "No service" on status bar when SIM unready
am:
c2b9f772d0 -s ours
Change-Id: I2631a6f1f21b9906a5ae2e46f087bc8c85f61595
Wenting Xiong [Thu, 13 Oct 2016 09:38:16 +0000 (17:38 +0800)]
Display "No service" on status bar when SIM unready
Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.
Test: manual - checked displaying "No service" on status bar
Bug:
29191964
Change-Id: Ic99cd465fca5989adf71171c2dad47561b3005f4
rongliu [Fri, 6 Oct 2017 23:42:27 +0000 (23:42 +0000)]
Merge "Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL as recommended." into oc-mr1-dev
am:
bf070a35cd
Change-Id: I88f24ed82459b4cbc03c92a96774636a47509715
TreeHugger Robot [Fri, 6 Oct 2017 23:29:32 +0000 (23:29 +0000)]
Merge "Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL as recommended." into oc-mr1-dev
Wenting Xiong [Thu, 13 Oct 2016 09:38:16 +0000 (17:38 +0800)]
Display "No service" on status bar when SIM unready
Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.
Test: manual - checked displaying "No service" on status bar
Bug:
29191964
Change-Id: I65c24d3382c8c667eaab76a88e4a64853ca71e0d
Santos Cordon [Thu, 5 Oct 2017 18:31:15 +0000 (11:31 -0700)]
Add keyguard state as a gate for VR Mode.
Problem: When the user toggles power button while in VR, they will be
taken to a black VR screen that occludes the keyguard.
VRManager previously used wakefulness and screen off as gates for VR Mode. However,
the keyguard state can be on or off when the device is awake so we need
to listen to the keyguard state as well.
Change:
1) Have ActivityManagerService tell VrManagerService about the keyguard
state the same as it does with wakefulness.
2) Stop applying any pending states when the device comes out of
sleep/screen-off/keyguard to force user into putting-headset-on (DON) UX
in those situations.
Bug:
66696304
Test: Manual - toggle device's power button and see logs of keyguard.
Test with all keyguard types.
Change-Id: I4ae03cb1c8c13acdc8cd11839f178bc8d8f6f515
Bryce Lee [Fri, 6 Oct 2017 22:30:16 +0000 (22:30 +0000)]
Merge "Restrict sending new intent to one invocation." into oc-mr1-dev am:
fed715e7b5
am:
079a9c375b
Change-Id: I739c9c7b1a75c24cf163f8523e656eb6791e7d44
Bryce Lee [Fri, 6 Oct 2017 22:18:18 +0000 (22:18 +0000)]
Merge "Restrict sending new intent to one invocation." into oc-mr1-dev
am:
fed715e7b5
Change-Id: I60ada8929f3439cee110f2e684b34c252d805e71
Tenghui Zhu [Fri, 6 Oct 2017 22:07:02 +0000 (22:07 +0000)]
Merge "Update ripple according to UX feedback."
Bryce Lee [Fri, 6 Oct 2017 21:58:50 +0000 (21:58 +0000)]
Merge "Restrict sending new intent to one invocation." into oc-mr1-dev
Kweku Adams [Wed, 27 Sep 2017 23:59:19 +0000 (16:59 -0700)]
Adding initial protos for batterystats dump.
Timer is the basic stat tracking object that's used for a lot of the
data in batterystats.
ControllerActivity data is tracked both per uid and for the entire
system, so it makes sense to define it now independently.
For the BatteryStatsHelper change: there's a small window of time after
boot where getSystemService will return null. I ran into it.
BUG:
65750808
Test: flash device and check incident proto output
Change-Id: I15e7d046a43f76d5f53d05b5138ea40f42e19d59
Andrew Sapperstein [Fri, 6 Oct 2017 01:23:13 +0000 (18:23 -0700)]
Update ANOMALY_DETECTION_CONSTANTS javadoc.
Adds more of the supported parameters including the new
wakeup blacklist parameter.
Bug:
67000019
Test: is comment change
Change-Id: Iee80b5cbf7972860e87efd5551bce962a3fa03c5
TreeHugger Robot [Fri, 6 Oct 2017 21:13:22 +0000 (21:13 +0000)]
Merge "Added apis for changing the system whitelist"
TreeHugger Robot [Fri, 6 Oct 2017 21:06:37 +0000 (21:06 +0000)]
Merge "New Autofill API: add (optional) content description on ImageTransformation."
Shubang [Fri, 6 Oct 2017 01:31:00 +0000 (18:31 -0700)]
Add permissions for LiveTv (AOSP)
It crashes without the permissions
Bug:
67474061
Test: make; flashall; install and open LiveTv;
Change-Id: Ifec8bfb4ee93ac6b9189a9c337fdd2ef9ec34537
TreeHugger Robot [Fri, 6 Oct 2017 20:43:30 +0000 (20:43 +0000)]
Merge "Refactor thumbnail layer code"
TreeHugger Robot [Fri, 6 Oct 2017 20:06:13 +0000 (20:06 +0000)]
Merge "New Autofill API: SaveInfo.addSanitizer()"
Vlad Zavidovych [Fri, 6 Oct 2017 19:46:57 +0000 (19:46 +0000)]
Merge "Add header to DropBox crash reports to indicate instant app crash"
TreeHugger Robot [Fri, 6 Oct 2017 19:44:02 +0000 (19:44 +0000)]
Merge "Fix test flake in AutoTileManagerTest"
Wenting Xiong [Fri, 6 Oct 2017 19:42:24 +0000 (19:42 +0000)]
Display "No service" on status bar when SIM unready am:
b267ecde4b -s ours am:
89f276b490 -s ours
am:
7ddbf72cb9 -s ours
Change-Id: I5536cdeef10c252bfb6d319eb016d8d833af43c9
Leon Scroggins III [Fri, 6 Oct 2017 19:33:35 +0000 (19:33 +0000)]
Merge "Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours am:
497520a1e8 -s ours am:
a2fbb123da -s ours" into oc-mr1-dev-plus-aosp
am:
302eeaddf0 -s ours
Change-Id: I721a2346c030251c334661b97b337d4883c012d8
Leon Scroggins III [Fri, 6 Oct 2017 19:17:59 +0000 (19:17 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours am:
497520a1e8 -s ours am:
a2fbb123da -s ours
am:
1716a48906 -s ours
Change-Id: I4f1c5500ec3f37d9b4b6df44c6bb67d93d7bbb44
Wenting Xiong [Fri, 6 Oct 2017 18:41:06 +0000 (18:41 +0000)]
Display "No service" on status bar when SIM unready am:
b267ecde4b -s ours
am:
89f276b490 -s ours
Change-Id: I35ced30763478ce7c76a1e667c7d0c4d5af150b2
Leon Scroggins III [Fri, 6 Oct 2017 18:35:02 +0000 (18:35 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours am:
497520a1e8 -s ours am:
6d3e25f36f -s ours
am:
eae03e7c90 -s ours
Change-Id: I169e0714f382d3d2794e9cd61e4580137e017aa8
Wenting Xiong [Fri, 6 Oct 2017 18:30:42 +0000 (18:30 +0000)]
Display "No service" on status bar when SIM unready
am:
b267ecde4b -s ours
Change-Id: I3e49fae02085e6457db867fbc18f9225d33758bc
Android Build Merger (Role) [Fri, 6 Oct 2017 18:28:13 +0000 (18:28 +0000)]
Merge "Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours am:
497520a1e8 -s ours am:
a2fbb123da -s ours" into oc-mr1-dev-plus-aosp
Leon Scroggins III [Fri, 6 Oct 2017 18:25:23 +0000 (18:25 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours am:
497520a1e8 -s ours
am:
a2fbb123da -s ours
Change-Id: Ia04176ff8fcc0b4647c3b3aaaddb089b80503406
rongliu [Fri, 6 Oct 2017 18:01:02 +0000 (11:01 -0700)]
Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
as recommended.
Change-Id: I3778eed6f91e3ebf70683f40389c605648444b99
Bug:
67420451
Test: Only add comment.
Leon Scroggins III [Fri, 6 Oct 2017 18:11:43 +0000 (18:11 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours am:
497520a1e8 -s ours
am:
6d3e25f36f -s ours
Change-Id: I15617243513768b17fbfa22cb95c7caae005783b
TreeHugger Robot [Fri, 6 Oct 2017 18:09:22 +0000 (18:09 +0000)]
Merge "Fix layer transform matrix for TextureView"
Leon Scroggins III [Fri, 6 Oct 2017 17:53:01 +0000 (17:53 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours
am:
497520a1e8 -s ours
Change-Id: I8cea5e47f98f4407029dfdcc281b4d6edad143b0
Leon Scroggins III [Fri, 6 Oct 2017 17:49:02 +0000 (17:49 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours am:
d9c818dce4 -s ours
am:
497520a1e8 -s ours
Change-Id: I636624656ef7f6b51b334f524554c0cd40833c04
Geoffrey Pitsch [Fri, 6 Oct 2017 17:47:46 +0000 (13:47 -0400)]
Fix test flake in AutoTileManagerTest
Use TestableLooper instead of default BG_LOOPER so no messages
will post while other tests are re-initializing Dependencies.
Test: runtest systemui
Change-Id: Ib2878120fadda9869f4dd721d961671224fb17a6
Vlad Zavidovych [Thu, 5 Oct 2017 22:37:13 +0000 (15:37 -0700)]
Add header to DropBox crash reports to indicate instant app crash
Bug:
62372653
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5a3d293d4bd7b54b6fcfe26516e51aff15354ded
Wenting Xiong [Thu, 13 Oct 2016 09:38:16 +0000 (17:38 +0800)]
Display "No service" on status bar when SIM unready
Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.
Test: manual - checked displaying "No service" on status bar
Bug:
29191964
Merged-In: I744ec9a3c70376199ba94d68331604276ea761c3
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3
Leon Scroggins III [Fri, 6 Oct 2017 17:28:40 +0000 (17:28 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9 am:
85a68d9e71 -s ours
am:
d9c818dce4 -s ours
Change-Id: Ib0e20e79c8d9708845aede08f86d17bb08855642
Leon Scroggins III [Fri, 6 Oct 2017 17:10:50 +0000 (17:10 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d am:
54c2cbb0f9
am:
85a68d9e71 -s ours
Change-Id: I09f8c134edef5c4cf67805faaf8cd56cae65ed69
ztenghui [Wed, 4 Oct 2017 22:45:44 +0000 (15:45 -0700)]
Update ripple according to UX feedback.
1. Consistent enter and exit duration and speed. Both bounded and
unbouned. It used to be that exit is much faster than enter.
2. Instead of starting from 0 size radius, we start from some size
according to the current drawable's bound.
b/
63635160
Test: demo app, settings app and calculator app
Change-Id: I1135fefc9d9103f170ab889269b38a9900835450
Leon Scroggins III [Fri, 6 Oct 2017 16:53:46 +0000 (16:53 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc am:
f32424b90d
am:
54c2cbb0f9
Change-Id: Iae83cebe615d0df3a6f2c6bdee6f8002d3ae82b0
Selim Cinek [Fri, 6 Oct 2017 16:39:41 +0000 (16:39 +0000)]
Merge "Fixed a bug where the order of the icons was wrong" into oc-mr1-dev am:
942aaf5ae8
am:
7c548a5712
Change-Id: Ib20dad12716a3472d6cf78f469e793ce18a5093d
Bryce Lee [Fri, 6 Oct 2017 00:20:25 +0000 (17:20 -0700)]
Restrict sending new intent to one invocation.
A special condition, where the new intent is delivered outside
the normal logic flow, was extended to included documents as well.
This can lead to any intent marked with the document launch flag
sending the intent in this block as well as the normal flow.
This changelist restricts the number of times the intent can be
sent to once during each activity start.
Change-Id: If1e62527d260cbe5ff170680695b03d9de532c09
Fixes:
67367621
Test: open Photos link in gmail twice
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsAppTestCases android.app.cts.NewDocumentTest
Leon Scroggins III [Fri, 6 Oct 2017 16:32:10 +0000 (16:32 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88 am:
2399d935bc
am:
f32424b90d
Change-Id: I405bee24b11319430e3490f3299d9c8b6438e407
Jean-Michel Trivi [Fri, 6 Oct 2017 16:29:48 +0000 (16:29 +0000)]
Merge "AudioService: log focus changes and limit focus stack size" into oc-mr1-dev am:
5bd051d981
am:
cb75ec6573
Change-Id: I7812917ad1c9485aff1553834e991bf202a4202c
Selim Cinek [Fri, 6 Oct 2017 16:28:59 +0000 (16:28 +0000)]
Merge "Fixed a bug where the order of the icons was wrong" into oc-mr1-dev
am:
942aaf5ae8
Change-Id: I199657bc2e2582cd2228045ae208d96bbc951485
Stan Iliev [Fri, 6 Oct 2017 14:16:58 +0000 (10:16 -0400)]
Fix layer transform matrix for TextureView
Fix order of matrix multipication and use drawImage instead of
shader.
Test: Ran camera app, message app and smart face lock app.
Bug:
67405584
Change-Id: I3df161d58218e1b1845f1c1ca2db2b12c51b3532
Leon Scroggins III [Fri, 6 Oct 2017 16:18:49 +0000 (16:18 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:
cfe2352d88
am:
2399d935bc
Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20
Jean-Michel Trivi [Fri, 6 Oct 2017 16:18:33 +0000 (16:18 +0000)]
Merge "AudioService: log focus changes and limit focus stack size" into oc-mr1-dev
am:
5bd051d981
Change-Id: I87719854512e9a61e55daeb914c84408b856f296
Selim Cinek [Fri, 6 Oct 2017 16:09:29 +0000 (16:09 +0000)]
Merge "Fixed a bug where the order of the icons was wrong" into oc-mr1-dev
Leon Scroggins III [Fri, 6 Oct 2017 16:06:34 +0000 (16:06 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
am:
cfe2352d88
Change-Id: Id7d59d95e8f5dfa68f7ff55ca5729a11a1fdf1d0
Jean-Michel Trivi [Fri, 6 Oct 2017 15:57:16 +0000 (15:57 +0000)]
Merge "AudioService: log focus changes and limit focus stack size" into oc-mr1-dev
Amith Yamasani [Fri, 6 Oct 2017 15:53:06 +0000 (15:53 +0000)]
Merge "Refactor App Standby code"
TreeHugger Robot [Fri, 6 Oct 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev
rongliu [Fri, 6 Oct 2017 15:12:11 +0000 (15:12 +0000)]
Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev am:
27378c64c7
am:
25b1093844
Change-Id: I0e2a64a72a9bbc14a1e8ef3a8b217d71b5eafb37
rongliu [Fri, 6 Oct 2017 14:57:36 +0000 (14:57 +0000)]
Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev
am:
27378c64c7
Change-Id: I45b685d99da325c627bf3f01b9038ddf81c781a1
TreeHugger Robot [Fri, 6 Oct 2017 14:38:42 +0000 (14:38 +0000)]
Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev
Paul Duffin [Fri, 6 Oct 2017 14:14:15 +0000 (14:14 +0000)]
Merge "Preserve order of shared library files"
Chalard Jean [Fri, 6 Oct 2017 10:21:43 +0000 (10:21 +0000)]
Merge "Add some useful helpers and constants." am:
ed8d236319 am:
0f4421873e am:
06d401ae73
am:
bbb7768f4f
Change-Id: I9bebe24f2c65ecaf31b70e02a45e0acd50e1430e
Chalard Jean [Fri, 6 Oct 2017 10:11:04 +0000 (10:11 +0000)]
Merge "Add some useful helpers and constants." am:
ed8d236319 am:
0f4421873e
am:
06d401ae73
Change-Id: Iaf611b8e39080d677c9cfe7edb124c11bbdf8a81
Erik Kline [Fri, 6 Oct 2017 10:02:52 +0000 (10:02 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" am:
3506aaf992 am:
cb2860362b am:
35d9ddf06d -s ours
am:
af15f85733 -s ours
Change-Id: Ia8b9a24f73c302dbd38dc220968424f3683ad742
Chalard Jean [Fri, 6 Oct 2017 09:58:27 +0000 (09:58 +0000)]
Merge "Add some useful helpers and constants." am:
ed8d236319
am:
0f4421873e
Change-Id: I2f7f4f69dcb4bbb1641af70a26ac95b1bb659ce8
Chalard Jean [Fri, 6 Oct 2017 09:48:32 +0000 (09:48 +0000)]
Merge "Add some useful helpers and constants."
am:
ed8d236319
Change-Id: I3a934e19ece91bf5957e4c5fa289bbc1a6242915
Erik Kline [Fri, 6 Oct 2017 09:45:07 +0000 (09:45 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" am:
3506aaf992 am:
cb2860362b
am:
35d9ddf06d -s ours
Change-Id: I4a971e6010049e8afc44d4c122405ec09f892f89
Chalard Jean [Fri, 6 Oct 2017 09:37:38 +0000 (09:37 +0000)]
Merge "Add some useful helpers and constants."
Erik Kline [Fri, 6 Oct 2017 09:34:49 +0000 (09:34 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" am:
3506aaf992
am:
cb2860362b
Change-Id: I9841bc9640c203a4b7d6698eddedbee7b8b24a8a
Erik Kline [Fri, 6 Oct 2017 09:25:29 +0000 (09:25 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors"
am:
3506aaf992
Change-Id: I3a37cf51b0763e42752d35fc26f70c63d3707fae
Treehugger Robot [Fri, 6 Oct 2017 09:16:18 +0000 (09:16 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors"
Erik Kline [Fri, 6 Oct 2017 03:56:55 +0000 (12:56 +0900)]
Log NAT update descriptions when receiving netlink errors
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- new logging messages observed
2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{...
Bug:
29337859
Bug:
32163131
Bug:
64976634
Bug:
67396342
Merged-In: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
Merged-In: I426b0a0545d56aba7924c416799b37731e7e4b18
Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050
(cherry picked from commit
a5ae9056e74a13d394c4bb6c36f9255214ffb68b)
Erik Kline [Fri, 6 Oct 2017 07:47:44 +0000 (07:47 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev am:
9dfbb0ead9
am:
18092bbd54
Change-Id: I426b0a0545d56aba7924c416799b37731e7e4b18
Erik Kline [Fri, 6 Oct 2017 07:35:06 +0000 (07:35 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
am:
9dfbb0ead9
Change-Id: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
Mike Ma [Fri, 6 Oct 2017 07:29:35 +0000 (07:29 +0000)]
Merge "Add AOD metrics in batterystats" into oc-mr1-dev am:
6204a60c53
am:
8cb8bdf657 -s ours
Change-Id: I1a25b4b0854d8f511bf4fd8d9f8295ed5695e9b4
TreeHugger Robot [Fri, 6 Oct 2017 07:21:43 +0000 (07:21 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
Mike Ma [Fri, 6 Oct 2017 07:17:25 +0000 (07:17 +0000)]
Merge "Add AOD metrics in batterystats" into oc-mr1-dev
am:
6204a60c53
Change-Id: Ife567f987a1585cb1108725db6ad63516a8dc67a
Mike Ma [Fri, 6 Oct 2017 07:01:36 +0000 (07:01 +0000)]
Merge "Add AOD metrics in batterystats" into oc-mr1-dev
Chong Zhang [Fri, 6 Oct 2017 05:39:50 +0000 (05:39 +0000)]
Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev am:
106aeb324d
am:
0764ce28cf
Change-Id: I59a84542c4cfc2cb48627396642dd2d4bbdc2291
Chong Zhang [Fri, 6 Oct 2017 05:29:43 +0000 (05:29 +0000)]
Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev
am:
106aeb324d
Change-Id: I5d7bbd0a3fb5f291f79a2e9009319eb4e57848a4
TreeHugger Robot [Fri, 6 Oct 2017 05:20:14 +0000 (05:20 +0000)]
Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev
Chalard Jean [Wed, 4 Oct 2017 05:51:42 +0000 (14:51 +0900)]
Add some useful helpers and constants.
Test: Pulled out of a client app ; the client app is behaving
Test: identically to how it was behaving before. Wrote unit
Test: tests in frameworks-net.
Change-Id: I397137748a95c65cee2e1e1b243a1a260e83a6f7
Erik Kline [Fri, 6 Oct 2017 03:56:55 +0000 (12:56 +0900)]
Log NAT update descriptions when receiving netlink errors
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- new logging messages observed
2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{...
Bug:
29337859
Bug:
32163131
Bug:
64976634
Bug:
67396342
Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050
TreeHugger Robot [Fri, 6 Oct 2017 04:31:20 +0000 (04:31 +0000)]
Merge "Fix dumpsys log to have correct component name for VrListenerService."
Brad Ebinger [Fri, 6 Oct 2017 04:23:19 +0000 (04:23 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" am:
b7dc3a3b21 am:
4910739237 am:
5b2afc8dab
am:
6a834447ef
Change-Id: I0c54947c73d99fbbaa976273f17746cc009b4e24
Brad Ebinger [Fri, 6 Oct 2017 04:12:31 +0000 (04:12 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" am:
b7dc3a3b21 am:
4910739237
am:
5b2afc8dab
Change-Id: Id8ca403a839cff994970c370973a91e8e5688722
Brad Ebinger [Fri, 6 Oct 2017 04:03:51 +0000 (04:03 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" am:
b7dc3a3b21
am:
4910739237
Change-Id: I7a0be565cebff2f87b136a6c29484ee43ca116ab
Jordan Liu [Fri, 6 Oct 2017 04:00:45 +0000 (04:00 +0000)]
Merge "Display "No service" on status bar when SIM unready" am:
a666dbb628 -s ours am:
e59a45f3ae am:
a71be8e2f1
am:
b3ed63ca23
Change-Id: I0fe5ea6f7ab4fcf30349b91d919a20954f7866db
Brad Ebinger [Fri, 6 Oct 2017 03:54:29 +0000 (03:54 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
am:
b7dc3a3b21
Change-Id: I16555b53bbf9c743921cbd36578af3550705a242
Jordan Liu [Fri, 6 Oct 2017 03:47:47 +0000 (03:47 +0000)]
Merge "Display "No service" on status bar when SIM unready" am:
a666dbb628 -s ours am:
e59a45f3ae
am:
a71be8e2f1
Change-Id: Ie92544f03960bddbd04f9c6b7e018cb5f646e50f
OSDN Git Service
