OSDN Git Service
TreeHugger Robot [Thu, 20 Jul 2017 04:24:50 +0000 (04:24 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
Philip Quinn [Wed, 19 Jul 2017 06:23:41 +0000 (23:23 -0700)]
Ping the StatusBar about power key events.
Bug:
63183852
Test: runtest systemui
Change-Id: I5d8209396e3e761b404c1071a7004f34c6e6c927
TreeHugger Robot [Thu, 20 Jul 2017 03:49:56 +0000 (03:49 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 02:37:56 +0000 (02:37 +0000)]
Merge "Fix format of subsystem power stats" into oc-dr1-dev
Philip Quinn [Wed, 19 Jul 2017 08:15:56 +0000 (01:15 -0700)]
Expose KeyguardMonitor.isOccluded().
Bug:
63806767
Test: runtest systemui
Change-Id: I36b96974c7a27e31ddbc3e8cdddf2516cce87b21
Christine Franks [Thu, 20 Jul 2017 01:04:51 +0000 (01:04 +0000)]
Merge "Add config_demoModePackage to symbols" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 00:46:05 +0000 (00:46 +0000)]
Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 00:18:20 +0000 (00:18 +0000)]
Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
Christine Franks [Wed, 19 Jul 2017 22:41:34 +0000 (15:41 -0700)]
Add config_demoModePackage to symbols
Bug:
62712426
Test: make -j100
Change-Id: I95a398a74d273d0aa7639989a367e902b305fa6c
Jeff Davidson [Wed, 19 Jul 2017 23:55:45 +0000 (16:55 -0700)]
Revert disabling of eSIM wipes/retains.
This is a revert of change I414a16cde11e76ccc390e7a63a6803f5b402fe78.
As an additional safety latch, we bypass all logic (either wipe or
retain) if the eSIM has never been provisioned. An unprovisioned eSIM
cannot possibly have profiles - indeed, we don't show the "Wipe eSIM"
checkbox in this case - so there's no reason to tell the LPA to retain
them.
Bug:
63693573
Test: TreeHugger + factory reset local test
Change-Id: I1fea50db317388e81823bf1bd0977ffe787a05e0
TreeHugger Robot [Thu, 20 Jul 2017 00:00:46 +0000 (00:00 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
Seigo Nonaka [Wed, 19 Jul 2017 23:54:11 +0000 (23:54 +0000)]
Merge "Fix race condition of removing surface." into oc-dr1-dev
Selim Cinek [Wed, 19 Jul 2017 23:41:44 +0000 (23:41 +0000)]
Merge "Reducing bitmap sizes in notifications" into oc-dr1-dev
Lucas Dupin [Wed, 19 Jul 2017 23:32:04 +0000 (23:32 +0000)]
Merge "Smoother system bars color transition" into oc-dr1-dev
Ahmed ElArabawy [Sat, 8 Jul 2017 00:48:13 +0000 (17:48 -0700)]
Fix format of subsystem power stats
The Subsystem power stats string in batteryStats dumpsys has an extra
newline that is causing PowerBug to skip the line when parsing the
history information.
Also, the string for subsystem power stats is missing a heading title
and has some redundant text
This commit fixes these format errors so powerbug can read and parse that
line successfully
Bug:
63447034
Test: Manual testing + Read the bugreport by historian and verify output
Change-Id: Idf971823dd5f769e653b4788b00fc025593d0d3d
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
Sungsoo Lim [Wed, 19 Jul 2017 22:41:02 +0000 (22:41 +0000)]
Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 22:40:32 +0000 (22:40 +0000)]
Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 22:02:09 +0000 (22:02 +0000)]
Merge "Add Configuration to APF Policy" into oc-dr1-dev
Mady Mellor [Wed, 19 Jul 2017 17:52:47 +0000 (10:52 -0700)]
Fix snooze not dismissing when it should
Simply check whether the guts is a leavebehind, if it is allow it to
be dismissed.
Test: manual - snooze a notification, touch outside note that it disappears
- show notification controls on a notification that will
be removed, note that the controls remain, once 'done' is
hit the notification is removed
Bug:
63788509
Change-Id: I42c97239f4e3e17f2e69322c94bd8e8f9d7f0737
TreeHugger Robot [Wed, 19 Jul 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Default gradient should be the dark version" into oc-dr1-dev
Sungsoo Lim [Mon, 17 Jul 2017 21:24:26 +0000 (14:24 -0700)]
Type check before casting from CookieHandler to CookieManager
CookieHandler.getDefault() doesn't always return CookieManager.
Bug:
63638018
Test: pass StreamingMediaPlayerTest#testHlsWithHeadersCookies
Test: manual with a test app
Change-Id: Ie7c19d38f779813f3fffb9abbcb3188a0fca3f45
Seigo Nonaka [Tue, 18 Jul 2017 03:22:44 +0000 (20:22 -0700)]
Fix race condition of removing surface.
mContainer.startingSurface can be replaced between posting
mRemoveStartingWindow and actually surface.remove() is called.
1. removeStartingWindow is called, then mRemoveStartingWindow is posted
to mHandler
2. transferStartingWindow is called, then mContainer.startingWindow is
replaced with new surface.
3. mHandler pops the callback and surface.remove() is called.
Here the remove is only called for replaced surface and never called for
older surface.
To fix this issue, surely removes the surface when the
removeStartingWindow is called.
Bug:
63156080
Bug:
63784898
Test: Watch /proc/<pid>/fd
Change-Id: I55e2c1b8fba32b3a19603e6ad4743f07576abd48
Selim Cinek [Tue, 11 Jul 2017 11:19:59 +0000 (13:19 +0200)]
Reducing bitmap sizes in notifications
Bitmap sizes could be arbitrary large when they were sent
over to the system. We're now reducing them to reasonable
sizes.s
Also fixed that notification bitmaps were not put into
ashmem anymore since it got lost in a refactor.
Test: code inspection
Bug:
62319200
Merged-In: I87db7656e749666b9eab1f67fd497f155c407e18
Change-Id: I87db7656e749666b9eab1f67fd497f155c407e18
TreeHugger Robot [Wed, 19 Jul 2017 18:01:26 +0000 (18:01 +0000)]
Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 15:21:32 +0000 (15:21 +0000)]
Merge ""Block notifications screen off" setting is used" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 14:19:54 +0000 (14:19 +0000)]
Merge "Fixes for increased usage of light navigation bar" into oc-dr1-dev
Christine Franks [Wed, 19 Jul 2017 13:59:22 +0000 (13:59 +0000)]
Merge "Add new configuration values for demo mode" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 13:11:26 +0000 (13:11 +0000)]
Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 11:45:50 +0000 (11:45 +0000)]
Merge "Send app transition starting event at right time" into oc-dr1-dev
Jorim Jaggi [Mon, 17 Jul 2017 16:31:13 +0000 (18:31 +0200)]
Fix wrong nav bar animation when unlocking from AOD
Visibility of navigation bar was set too late. Set it earlier
such that it gets the right animation.
In addition to that, fixes a bug where Keyguard unlock animation
was terminated too early if there was already a scrim animation
pending.
Test: Wake-and-unlock from Aod
Bug:
63726451
Change-Id: I9a45fb27db68d56904c0fade40ea1173176beae8
Jorim Jaggi [Mon, 17 Jul 2017 14:46:00 +0000 (16:46 +0200)]
Fixes for increased usage of light navigation bar
- Fix an issue where IME doesn't really cover nav area but still
became window to deterine light navigation.
- Only invert nav bar icons when expanding the shade if the scrim
is dark.
- Fix logic such that status bar always becomes the window to
dermine light nav bar on lockscreen.
Test: Open shade with light nav
Test: Open Keyguard in landscape in all apps
Test: Unlock phone with light nav
Change-Id: If024a8b81942a6675243b703c0509cd88de8d932
Fixes:
63539478
Fixes:
63533427
Fixes:
63577858
Jorim Jaggi [Wed, 19 Jul 2017 10:17:37 +0000 (10:17 +0000)]
Merge "Fix threading issue with splash screens" into oc-dr1-dev
Jorim Jaggi [Tue, 18 Jul 2017 11:22:52 +0000 (13:22 +0200)]
Send app transition starting event at right time
Otherwise we are skipping an important section of the code that
might contain delays.
Test: Go to recents, check app transition delay in eventlog
Change-Id: Ie9ccc1dd37f1a0ffeb7c18a410a5148dbfb02ccf
Fixes:
63793419
Ricardo Loo [Wed, 19 Jul 2017 04:44:52 +0000 (04:44 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am:
8e644a7510
Change-Id: Ib12f6abb1cd3bdc4701b13e607288fcaf48ce43e
Lucas Dupin [Wed, 19 Jul 2017 04:40:28 +0000 (21:40 -0700)]
Smoother system bars color transition
Easing out too fast makes the status bar feel like it's flashing.
Test: visual
Change-Id: I3c6fb528efd22d13f890024e73b76d2e50d71163
Fixes:
63629289
Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
Chen Xu [Wed, 19 Jul 2017 03:06:01 +0000 (03:06 +0000)]
Merge "initial value for data_roaming based on carrier" into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 01:19:03 +0000 (01:19 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours
am:
ea6aaed42d
Change-Id: If720a3669b9d04ea115609bac0e1e60d5a7bc291
Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028
am:
72c56fb84a -s ours
Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3
Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d
am:
a84f7a3028
Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1
Android Build Merger (Role) [Wed, 19 Jul 2017 00:56:36 +0000 (00:56 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216 am:
a81076b2e8" into oc-dr1-dev
TreeHugger Robot [Wed, 19 Jul 2017 00:55:42 +0000 (00:55 +0000)]
Merge "Put generated/compiled graphics code in getCodeCacheDir()" into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
am:
4a1dc3458d
Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768
Phil Weaver [Wed, 19 Jul 2017 00:52:23 +0000 (00:52 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216
am:
a81076b2e8
Change-Id: I91ec75b1c21fc278c2bb723cf791cae1e94f52ec
Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
Badhri Jagan Sridharan [Wed, 19 Jul 2017 00:29:10 +0000 (17:29 -0700)]
Always reevaluate whether to show the notification for USB_DEVICE_* intents
The decision whether to show or hide the "Usb supplying power.."
notification is based on two different broadcasts
1. USB_DEVICE_ATTACHED/DETACHED
2. USB_PORT_CHANGED
Depending on how long the port takes to enumerate, the required
intents might arrive in different order. Previously, it was assumed
that the ATTACHED broadcast would arrive before the PORT_CHANGED
broadcast and the code was aggressive to reduce the number of
times the decision to display/hide the notification is made.
This might cause the notification to be displayed in some instances
when it is not supposed to be displayed. This CL makes the usb service
to always reevaluate whenever USB_DEVICE_ATTACHED/DETACHED is
received.
Also, adding logs to print whenever the notification in enqueued/
dequeued.
Bug:
63785369
Test: Verified that the notification is displayed when connecting
to another pixel device and hidden when mouse or headset is
connected.
Change-Id: I30650a2d9923d01a1fce4b9450e65ec7f4e6557b
Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5
am:
d761dad216
Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0
fionaxu [Fri, 23 Jun 2017 01:14:23 +0000 (18:14 -0700)]
initial value for data_roaming based on carrier
1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
Bug:
36193933
Test: manual test
Change-Id: Ie4f3a0714059e1a7257c84802db475c92c17e1b3
Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a
am:
2da30457c5
Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091
Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3
am:
edbe4bd86a
Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade
Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548
am:
afdcad0df3
Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe
Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours
am:
9e39e1e548
Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f
Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4
am:
996bc6bc12 -s ours
Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819
Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714
am:
9625d164e4
Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1
Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56
am:
0ddd7e4714
Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f
TreeHugger Robot [Tue, 18 Jul 2017 23:35:19 +0000 (23:35 +0000)]
Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev
Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
am:
093c7a8e56
Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53
Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
Christine Franks [Tue, 18 Jul 2017 23:18:40 +0000 (23:18 +0000)]
Merge "Disable lock screen by default for demo users" into oc-dr1-dev
Romain Guy [Tue, 18 Jul 2017 22:42:06 +0000 (15:42 -0700)]
Put generated/compiled graphics code in getCodeCacheDir()
A refactoring introduced a slight regression that caused compiled
shaders to be cached in the wrong directory.
Bug:
63813783
Test: Manual
Change-Id: I863e584ff1df4cda9242c64afd643a899023ee1c
Selim Cinek [Tue, 18 Jul 2017 22:43:46 +0000 (22:43 +0000)]
Merge "Fixed the text alignment with RTL text" into oc-dr1-dev
Christine Franks [Tue, 18 Jul 2017 20:25:19 +0000 (13:25 -0700)]
Add new configuration values for demo mode
Bug:
62712426
Test: make -j100
Change-Id: I0a205f8d9004d531fa68c3cb4d3bf98cf5741914
Phil Weaver [Tue, 18 Jul 2017 22:35:06 +0000 (22:35 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35 am:
713a5420dd
am:
80c2eeedbb
Change-Id: I3183c725f1c8246481543832644518d5a2f566c0
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
Back-port fixes for b/
62196835
Bug:
62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
Phil Weaver [Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35
am:
713a5420dd
Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e
Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390
am:
fef2328f35
Change-Id: Ifc093c5a322bdb94717cfaebe9a9bab255e22789
Phil Weaver [Tue, 18 Jul 2017 22:08:34 +0000 (22:08 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours
am:
442fc85852
Change-Id: I2332b61077924a2c8c5cdad5f440acb856db4acf
Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours
am:
2a93c3d390
Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de
Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7
am:
cfbe89ad32 -s ours
Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e
Phil Weaver [Tue, 18 Jul 2017 21:57:14 +0000 (21:57 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours
am:
4607ec8f6d
Change-Id: I39e8256ddc46d1af59a08fdaf8af02795cca8a36
Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8
am:
4fa8b51c0c -s ours
Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8
Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f
am:
ac700bc3c7
Change-Id: If57bab0ee9d5459286339845284adb3f0163c401
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a
am:
982cf0d212 -s ours
Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903
Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev
am:
0b0834fbe8
Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb
Phil Weaver [Tue, 18 Jul 2017 21:44:01 +0000 (21:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018
am:
3700014be0
Change-Id: Id7dbefd2586c25730efc719bd787cdf70c98c7f0
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db
am:
d2c4007d8a
Change-Id: I9c749eb931db880073de06259232f5f03c91cd32
Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c
am:
b2e3fb162f
Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f
am:
faded53018
Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c
Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f
am:
27ad1fbc2c
Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42
Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69
am:
783253f6db
Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329
Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev
Roozbeh Pournader [Tue, 18 Jul 2017 21:22:40 +0000 (14:22 -0700)]
Remove Tigrinya (ti) from Settings languages
Tigrinya does not have any localized country names for ER (Eritrea)
and ET (Ethiopia), which the user would need to choose if they choose
Tigrinya. Removing from user selectable languages until CLDR/ICU
adds more data.
Change-Id: Iaa7f702db0bb8749a4bdc2e88b03e5ea8590bad9
Fixes:
63807177
Test: Manual (Tigrinya is no longer shown in Settings)
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957
am:
79c476704f
Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63
Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours
am:
bbb567757f
Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b
Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae
am:
aa8976fa69
Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e
Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e
am:
a1dca32957
Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9
Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours
am:
f44b48acae
Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad
Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94
am:
7e82d6204f -s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c
am:
b968d99e3e
Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a
Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d
am:
cf7ce06abd -s ours
Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4
am:
5264237c94
Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178
Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89
am:
83261a8b5c
Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8
Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed
am:
62eca82f89
Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb
am:
f05a6fc52d
Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33
Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c
am:
68f7106cf4
Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e
Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e
am:
e11e076fed
Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5
Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240
am:
219d9b5dfb
Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623
Michael Plass [Tue, 18 Jul 2017 20:44:43 +0000 (13:44 -0700)]
WifiInfo - document packet counters and rates
Bug:
63039962
Test: wifi unit tests
Change-Id: Ibc17265e88ed174fce9bbffa32261080d076cea3
Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours
am:
5d46833d9c
Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4
Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5
am:
e06843fe7e
Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2
OSDN Git Service
