Commit Graph

340212 Commits

Author SHA1 Message Date
Android Build Merger (Role)
f751caf642 Merge "Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev am: 21bc3a39a4 am: 1af850fdfe" 2017-08-19 01:16:26 +00:00
TreeHugger Robot
64059f2eec Merge "Support extra linespacing based on fallback fonts" 2017-08-19 01:15:37 +00:00
Lorenzo Colitti
203c935d74 Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev am: 21bc3a39a4
am: 1af850fdfe

Change-Id: I2b586b84c44126e1d3b9097950a41decaa5216cc
2017-08-19 01:12:35 +00:00
Lorenzo Colitti
1af850fdfe Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev
am: 21bc3a39a4

Change-Id: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee
2017-08-19 01:02:33 +00:00
Lorenzo Colitti
21bc3a39a4 Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev 2017-08-19 00:54:59 +00:00
TreeHugger Robot
a55e5640ed Merge "Fix typo in Window.onDetachedFromWindow()" 2017-08-19 00:32:48 +00:00
Christopher Tate
6e2c3a2b36 Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev am: 39a7fe7939
am: 8a04ed4c46

Change-Id: Ic267302dad04c428557168552d9b0299a9186cfa
2017-08-19 00:25:03 +00:00
Christopher Tate
8a04ed4c46 Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev
am: 39a7fe7939

Change-Id: Iaeddac03bcf98c1d714c96b54344d8cf874682d2
2017-08-19 00:15:33 +00:00
TreeHugger Robot
39a7fe7939 Merge "Improve alarm in-flight diagnostics" into oc-mr1-dev 2017-08-19 00:09:41 +00:00
Makoto Onuki
976c414fb9 Merge "SyncManager: detect suspicious periodic sync removal." into oc-mr1-dev am: 5d9ec3f840
am: 4a0e643ebe

Change-Id: Ia975a6d07f3a9be063516d4bb83cbfadb76077ad
2017-08-18 23:46:59 +00:00
Makoto Onuki
4a0e643ebe Merge "SyncManager: detect suspicious periodic sync removal." into oc-mr1-dev
am: 5d9ec3f840

Change-Id: I7fc888ac5d35a721716f0325793c4c2557a36041
2017-08-18 23:38:33 +00:00
TreeHugger Robot
5d9ec3f840 Merge "SyncManager: detect suspicious periodic sync removal." into oc-mr1-dev 2017-08-18 23:31:37 +00:00
Selim Cinek
171a3e07ad Merge "Fixed a bug where a removed notification would stick around" into oc-mr1-dev am: ba55894ec8
am: 988ef15c33

Change-Id: Ib0faa3d5e717c9ffa86bc719faff261c448765a8
2017-08-18 22:35:25 +00:00
Chet Haase
e7bf2191c9 Fix typo in Window.onDetachedFromWindow()
Bug: 64788487 Wrong description of the Window.Callback.onDetachedFromWindow()
Test: N/A (doc-only fix)
Change-Id: I33ee34e10fed64c593f74942e28e187358b6b212
2017-08-18 15:27:18 -07:00
Selim Cinek
988ef15c33 Merge "Fixed a bug where a removed notification would stick around" into oc-mr1-dev
am: ba55894ec8

Change-Id: If767d72496dbabb59cb500e2763928f7a21198bc
2017-08-18 22:25:57 +00:00
TreeHugger Robot
ba55894ec8 Merge "Fixed a bug where a removed notification would stick around" into oc-mr1-dev 2017-08-18 22:18:57 +00:00
Bryce Lee
96a91f11c1 Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev am: 1327cdc53d
am: 004f9a3066

Change-Id: Ifcbb0d3fbde8f87052509d5ef0a0b57e013e2245
2017-08-18 21:55:35 +00:00
Bryce Lee
004f9a3066 Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev
am: 1327cdc53d

Change-Id: I18e0a89f4afcdaa61da289566c275a29dadc9c28
2017-08-18 21:40:44 +00:00
Bryce Lee
1327cdc53d Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev 2017-08-18 21:33:46 +00:00
Christopher Tate
eabba7366e Improve alarm in-flight diagnostics
Also, use .equals() rather than == when searching the list of in-flight
operations.  Sometimes we appear to fail to match PendingIntents when
their send() completes, for unknown reasons, and this specific point of
usage is one where a mismatch might lead to the observed behavior.
(It is still unknown why == might ever fail here, and the problem is not
readily reproducible.)

Bug: 64358454
Test: manual, observing correctness of the diagnostics

Change-Id: I4f5c07b0df44dfb4c292976b3a49482ed408d12c
2017-08-18 21:28:54 +00:00
Makoto Onuki
8ee6ecc1d0 Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev am: edda7ebdd9
am: 4558b89ca2

Change-Id: I0094396111cccaa5210252bbc2b9fa3eaa4d859a
2017-08-18 21:23:52 +00:00
Makoto Onuki
4558b89ca2 Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev
am: edda7ebdd9

Change-Id: Ide5189580c7b930e4aa86aa68b52460b91d6f8d7
2017-08-18 21:02:54 +00:00
TreeHugger Robot
a7d4e1d2f6 Merge "[Companion] Synchronize state access in CallbackProxy" 2017-08-18 20:56:50 +00:00
Makoto Onuki
dd4b14f70d SyncManager: detect suspicious periodic sync removal.
- Also disallow and detect JobScheduler.cancelAll() for the system UID.
- Also wtf() if jobs.xml can't be read.

Bug: 64536115
Test: boot, add & remove google accounts

Change-Id: I953c12f70b479cf5f71a81a3787c103599f243c8
2017-08-18 13:50:43 -07:00
TreeHugger Robot
edda7ebdd9 Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev 2017-08-18 20:50:07 +00:00
Pankaj Kanwar
13fe27bf76 Merge "Building IMSI encryption support." into oc-mr1-dev am: 94fa7ee972
am: 99512fd446

Change-Id: I703024e2d6b0bc193b89a1e0d76c15868cdc38ce
2017-08-18 20:46:02 +00:00
Pankaj Kanwar
99512fd446 Merge "Building IMSI encryption support." into oc-mr1-dev
am: 94fa7ee972

Change-Id: Ie3f8787de3cdb0db08724f99ee0b52a2ba228d5b
2017-08-18 20:30:15 +00:00
Pankaj Kanwar
94fa7ee972 Merge "Building IMSI encryption support." into oc-mr1-dev 2017-08-18 20:23:08 +00:00
Selim Cinek
b2e0f33ea4 Fixed a bug where a removed notification would stick around
Because we going back to the keyguard, the translation was
reset and the callback would not be called, leaving us with
a stuck notification.

Test: have only 1 notification in shade locked an swipe it away after doing a half-swipe first
Change-Id: Iea2db4ff7efa2e84aa36cd13cfa8cfa1859d6892
Fixes: 64762751
2017-08-18 12:24:38 -07:00
Julia Reynolds
65de162104 Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev am: 21bc812a25
am: ef2264e849

Change-Id: I6fa57c1d36f9a5d2467c3a2becbd83251184ac90
2017-08-18 18:52:49 +00:00
Julia Reynolds
ef2264e849 Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev
am: 21bc812a25

Change-Id: I2376f1ddba23dfc9cf872082cd7a43164eb0b870
2017-08-18 18:35:24 +00:00
Julia Reynolds
d736cb8800 Merge "Clean up binding list on error" into oc-mr1-dev am: 563e4982a9
am: 7544eed3ce

Change-Id: I57d06b844fb6aea56fac300d334156daf1dbc7f9
2017-08-18 18:20:46 +00:00
TreeHugger Robot
21bc812a25 Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev 2017-08-18 18:18:57 +00:00
Julia Reynolds
7544eed3ce Merge "Clean up binding list on error" into oc-mr1-dev
am: 563e4982a9

Change-Id: Id599274866a7686fa49f377c2911b6fba64201f5
2017-08-18 18:05:46 +00:00
Makoto Onuki
48e931659f Avoid potential reboot loop due to package cache
Bug: 64295061

Test: Boot (write package cache) and reboot (read package cache)
Change-Id: I5de712c9666bac71ff6121001163ebc90c4b62d0
2017-08-18 11:00:19 -07:00
Adrian Roos
fa305f4b25 Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev am: a528ee13bd
am: 44931559d0

Change-Id: I321cd6a2f15db0f390e0243cd7f28a029b074639
2017-08-18 17:56:33 +00:00
TreeHugger Robot
563e4982a9 Merge "Clean up binding list on error" into oc-mr1-dev 2017-08-18 17:55:46 +00:00
Wale Ogunwale
58cb974e4e Merge "Introducing WindowConfiguration" 2017-08-18 17:46:25 +00:00
Adrian Roos
44931559d0 Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev
am: a528ee13bd

Change-Id: Ic5dddc98fc58abc7c813f58b79df6b2ab38e4f2e
2017-08-18 17:45:14 +00:00
TreeHugger Robot
a528ee13bd Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev 2017-08-18 17:37:12 +00:00
TreeHugger Robot
997eafcbf2 Merge "Expose grantPermission via systemApi." 2017-08-18 17:05:19 +00:00
Adrian Roos
54a6ee28d0 Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev am: 713a92390e
am: dd4e76b687

Change-Id: I753cd906156779c7658812b5f6378d214d4f1de7
2017-08-18 16:50:02 +00:00
pkanwar
becc8696a8 Building IMSI encryption support.
Added additional error checks while returning the key.
Create config parameter:
1. IMSI_KEY_AVAILABILITY_INT.
BUG: 35606429
Test: manual

Change-Id: Iaa5fed3b51719679051626081d82b85a04128896
2017-08-18 09:41:08 -07:00
Adrian Roos
dd4e76b687 Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev
am: 713a92390e

Change-Id: Iedb7368829c0b4d82c6ca8e0417340d78f180493
2017-08-18 16:34:10 +00:00
TreeHugger Robot
713a92390e Merge "LockSettings: Enforce permission check on havePattern/havePassword/systemReady" into oc-mr1-dev 2017-08-18 16:24:43 +00:00
TreeHugger Robot
0f9774e1d9 Merge "Cleaned up the permission checks in NetworkScoreService" 2017-08-18 16:20:43 +00:00
Lorenzo Colitti
5356a35c3b Add tether offload traffic to interface stats as well.
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.

To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
   indicate whether per-UID stats are requested. For clarity,
   define integer constants STATS_PER_IFACE and STATS_PER_UID
   to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
   stats are requested. (Otherwise tethering traffic would be
   double-counted).
3. Make OffloadController's stats provider return the same
   stats regardless of whether per-UID stats were requested or
   not.
4. Make NetworkStatsService add non-per-UID tethering stats to
   the dev and XT snapshots. The per-UID snapshots were already
   correctly adding in per-UID stats.

Bug: 29337859
Bug: 32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I7a4d04ab47694d754874136179f8edad71099638
2017-08-19 00:21:56 +09:00
Wale Ogunwale
822e512127 Introducing WindowConfiguration
Used to house configurations that don't affect resources and that
we don't want to communicate to apps, but need to be propagated
along side Configuration.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I97de3efbe6d5e1d3b07156a8cfbce9be5eae5cb5
2017-08-18 07:57:06 -07:00
Julia Reynolds
5e702195cd Exclude autogrouping from rate limiter
To prevent concurrent updates from the app from
being dropped

Test: cts, notificationmanagertest
Change-Id: Id5047b04644599a862f1b6d2a340bc79ad761f9f
Fixes: 64804822
2017-08-18 10:23:14 -04:00
Julia Reynolds
72b411778c Clean up binding list on error
So that we can try again

Test: manual
Change-Id: I6be1e8d0377930d52c599261a7381c1e377cbcfc
Fixes: 64458792
2017-08-18 10:23:14 -04:00