OSDN Git Service
Bill Yi [Sun, 8 Oct 2017 07:19:14 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE am:
87c4d55ccb -s ours
am:
12d48a9b60 -s ours
Change-Id: I6a7668d596cb53a3596a50fc63de18baed51dba9
Bill Yi [Sun, 8 Oct 2017 07:08:47 +0000 (07:08 +0000)]
Import translations. DO NOT MERGE
am:
87c4d55ccb -s ours
Change-Id: I088ba3df3f4339070c1f26929815b3827403dd18
Bill Yi [Sun, 8 Oct 2017 07:08:18 +0000 (07:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1f22b044bb -s ours
Change-Id: I13d72cc05838f147a88fe62ecfcbfac1b80ee3b2
TreeHugger Robot [Sun, 8 Oct 2017 06:59:49 +0000 (06:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 8 Oct 2017 00:23:29 +0000 (17:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I944d5c1ac050fe65d777b815adb59f5d6536811a
Bill Yi [Sun, 8 Oct 2017 00:14:24 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If025d5171c5b4109c98d13b8cf6df3073f2687e5
Selim Cinek [Sat, 7 Oct 2017 17:45:40 +0000 (17:45 +0000)]
Merge "Fixed an issue where added icons were white in multiwindow" into oc-mr1-dev
am:
3f0dd94efc
Change-Id: I1fdb7cc9eba446167cf7d78cae2533a4bb5c3f89
TreeHugger Robot [Sat, 7 Oct 2017 17:34:40 +0000 (17:34 +0000)]
Merge "Fixed an issue where added icons were white in multiwindow" into oc-mr1-dev
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: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
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:08:21 +0000 (00:08 +0000)]
Merge "Display "No service" on status bar when SIM unready" into oc-mr1-dev-plus-aosp
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:18:18 +0000 (22:18 +0000)]
Merge "Restrict sending new intent to one invocation." into oc-mr1-dev
am:
fed715e7b5
Change-Id: I60ada8929f3439cee110f2e684b34c252d805e71
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
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
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
Selim Cinek [Fri, 6 Oct 2017 20:37:32 +0000 (13:37 -0700)]
Fixed an issue where added icons were white in multiwindow
Because it wasn't laid out yet, icons would appear white.
Change-Id: I9338966299de253f36ae325553e82b76defe3b9d
Fixes:
66711268
Test: add icon with light statusbar in multiwindow, icon looks normal
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
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
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
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
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
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
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
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
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 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
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
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:35:06 +0000 (07:35 +0000)]
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
am:
9dfbb0ead9
Change-Id: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34
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: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
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
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
Treehugger Robot [Fri, 6 Oct 2017 03:43:31 +0000 (03:43 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call"
Jordan Liu [Fri, 6 Oct 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Display "No service" on status bar when SIM unready" am:
a666dbb628 -s ours
am:
e59a45f3ae
Change-Id: I76241cdf485b9b9e6193a22cf5748d8695ff8d23
Jordan Liu [Fri, 6 Oct 2017 03:25:25 +0000 (03:25 +0000)]
Merge "Display "No service" on status bar when SIM unready"
am:
a666dbb628 -s ours
Change-Id: I7f0987c397206fcd3becf16e5d867bf57d2fc528
gopinath [Fri, 6 Oct 2017 01:09:43 +0000 (01:09 +0000)]
Avoid spaces in the trace file names.
am:
bb3ff15495
Change-Id: Id9c8733c21f9aaee286519e45647c57067cc5b1b
Mike Ma [Tue, 19 Sep 2017 23:06:03 +0000 (16:06 -0700)]
Add AOD metrics in batterystats
Fixes:
64899521
Test: manual - flash build, reset batteryStats, use device > 1 hr
with alternating pattern between screen on/off/AOD. Dump stats, check
all screen related stats look normal, esp. record matches actual time
spent in each screen state. In raw bugreport:
Search "amount discharged" for % discharge;
Search "Screen on/off/doze discharge" for mAh discharge;
Search "time on battery" for up/real time in each state.
Test: Added two unit tests for note AOD screen state
Merged-In: I7193a36751124dd380818b2b665303c0f0d8c984
Change-Id: I51cead7f92abd9e4c620f7dfde393993cdad494e
Selim Cinek [Fri, 6 Oct 2017 00:12:18 +0000 (17:12 -0700)]
Fixed a bug where the order of the icons was wrong
Because the normal order would not factor in the
yTranslation.
Change-Id: Ie37b69ee5187c4f4bd58f90d8297cf73b7a4ed53
Fixes:
67017075
Test: swipe through notification in statusbar, observe right ordering
Tobias Thierer [Thu, 5 Oct 2017 23:38:06 +0000 (23:38 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc." am:
ed6ae8f2b1 am:
8d4e36b1e8
am:
7c8e38c2cc
Change-Id: Idf7ff7b214281982a4a747c1e0af4cf54f622865
Jordan Liu [Thu, 5 Oct 2017 23:30:45 +0000 (23:30 +0000)]
Merge "Display "No service" on status bar when SIM unready"
Tobias Thierer [Thu, 5 Oct 2017 23:21:40 +0000 (23:21 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc." am:
ed6ae8f2b1
am:
8d4e36b1e8
Change-Id: Iba6de5e888f7de9835199eda278c46f6b3c261d8
Tobias Thierer [Thu, 5 Oct 2017 23:12:37 +0000 (23:12 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
am:
ed6ae8f2b1
Change-Id: I8bd1f9b3994f480d55d7c885b2c24227a67915e9
Tobias Thierer [Thu, 5 Oct 2017 23:01:03 +0000 (23:01 +0000)]
Merge "Fix documentation generation with OpenJDK 9 javadoc."
gopinath [Sat, 16 Sep 2017 01:09:02 +0000 (18:09 -0700)]
Avoid spaces in the trace file names.
Having spaces in the trace file names introduces slashes in the
file names and not able to pull the file names with the slashes
from the device.So avoid having spaces while constructing the
trace file names.
Bug : b/
65737738
Change-Id: Ie1971566586f77d18b17722ce0e3cc9ef3ebfdd3
(cherry picked from commit
3f04fb1bcf168e5ea8aae090f86b9122189c6390)
Chong Zhang [Thu, 5 Oct 2017 22:12:36 +0000 (15:12 -0700)]
Use rotation from MediaMetadataRetriever directly
MediaMetadataRetriever now reports rotation in clockwise,
no longer need to translate.
bug:
67470228
Test: verified rotation using test app attached in bug
Change-Id: Ifebcf25ea302477818e2e03db1e55525db985e67
Jean-Michel Trivi [Thu, 5 Oct 2017 19:19:23 +0000 (12:19 -0700)]
AudioService: log focus changes and limit focus stack size
Log audio focus request and abandon commands.
Limit the size of the audio focus stack to prevent malicious
applications trying to run the process out of memory.
Test: use media apps and speech reco, check dumpsys audio
Bug:
67055749
Change-Id: I529529fe40f33a8f67c64c3c61ba22d9530fb4d9
Ruben Brunk [Thu, 5 Oct 2017 20:55:37 +0000 (20:55 +0000)]
Fix NPE in dumpsys logs.
am:
b844956d69
Change-Id: I4c1c5f03ddfee30cc602a76d15e31267ed4e1b1f
Ruben Brunk [Thu, 5 Oct 2017 20:30:47 +0000 (13:30 -0700)]
Fix NPE in dumpsys logs.
Bug:
67460310
Bug:
66967700
Test: adb shell dumpsys vrmanager
Change-Id: I008717663dd5ae4fe99ca62f631794a56ca2eb12
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call
There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.
Bug:
66986066
Test: Manual, PIN/PUK locked SIM
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3
Ruben Brunk [Thu, 5 Oct 2017 14:27:12 +0000 (14:27 +0000)]
Change recovery logic for services bound by VrManagerService.
am:
d675f51c72
Change-Id: I58ffdf20a027baa648129f61f484d76511290435
Ruben Brunk [Tue, 3 Oct 2017 22:39:41 +0000 (15:39 -0700)]
Change recovery logic for services bound by VrManagerService.
- On AIO VR devices (where live VR services are required to render
anything), reconnect to the VrListenerService and VR compositor service
indefinitely and never leave VR + persistent mode.
- On smartphone VR devices, do not reconnect if the VrListenerService
dies for any reason, instead immediately leave VR + persistent mode. If
the VR compositor dies, reconnect a limited number of times. The
expectation is that the VrListenerService process will detect the
compositor crashes separately (via a shared service binding), and chose
to either attempt to fall back to a previous render path or simply
propagate the crash and leave VR mode entirely.
- Update dumpsys logging to include lifecycle events from the
VrListenerService and VR compositor service.
Bug:
66967700
Test: Manual test with VrCore APK by logging when the VR services are
connected and killing each VrCore process from ADB shell.
e.g.:
- Repeatedly kill the VrCore main process.
- Repeatedly kill the VrCore compositor process.
- Repeatedly kill both processes.
Change-Id: I8952b872b39102a601f66bc6624fc0ad92ca0f30
dimitry [Thu, 5 Oct 2017 10:21:59 +0000 (10:21 +0000)]
Merge "NativeActivity: Improve error message reporting" am:
de3150db1e am:
7de4dd6e07
am:
ef85667803
Change-Id: I03af96d3c6f3e188841ea5015de805d88038975b
dimitry [Thu, 5 Oct 2017 10:04:12 +0000 (10:04 +0000)]
Merge "NativeActivity: Improve error message reporting" am:
de3150db1e
am:
7de4dd6e07
Change-Id: Ifb7d744bade56fd723567cc774a2849b03cbdeb4
dimitry [Thu, 5 Oct 2017 09:53:27 +0000 (09:53 +0000)]
Merge "NativeActivity: Improve error message reporting"
am:
de3150db1e
Change-Id: Icdce5b900d87e136a398f6c68c4706b53dcdcec0
Treehugger Robot [Thu, 5 Oct 2017 09:44:21 +0000 (09:44 +0000)]
Merge "NativeActivity: Improve error message reporting"
Ruben Brunk [Thu, 5 Oct 2017 04:03:03 +0000 (04:03 +0000)]
Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
am:
c765c2c448
Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
TreeHugger Robot [Thu, 5 Oct 2017 03:53:44 +0000 (03:53 +0000)]
Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
Jeremy Joslin [Thu, 5 Oct 2017 01:18:57 +0000 (01:18 +0000)]
Merge "Add isOpenNetwork() to WifiConfiguration." into oc-mr1-dev
am:
3ea0acac69
Change-Id: Ia64bcf53c94eca8245e581b36318064d73a57bb6
Android Build Merger (Role) [Thu, 5 Oct 2017 01:10:24 +0000 (01:10 +0000)]
Merge "Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d am:
0bdb9a6e00 am:
cc51ef0a47" into oc-mr1-dev-plus-aosp
nharold [Thu, 5 Oct 2017 01:07:53 +0000 (01:07 +0000)]
Merge "Cosmetic Cleanups for IpSecService" am:
5ade9a228d am:
0bdb9a6e00
am:
cc51ef0a47
Change-Id: I0a9c52ca26ad1b7e4505f7c9dc32ad9550b62afc
Karthik Ravi Shankar [Thu, 5 Oct 2017 01:06:30 +0000 (01:06 +0000)]
Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev
am:
d947ff602e
Change-Id: I821158f29b35e960e8c73c4ca3d14ab3b9c1db66