Commit Graph

280342 Commits

Author SHA1 Message Date
Philipp Weiß
4e02b89a1e Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
am: 4d3aa8e8ab

Change-Id: Ibba35390892874fc32c0f9cebd50077b617e5e96
2016-12-20 18:06:53 +00:00
phweiss
ccf8d9e9cf DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
am: 2f512047c2

Change-Id: If56eee8a498435aaa059990eceea9555897e11b9
2016-12-20 18:06:47 +00:00
Philipp Weiß
4d3aa8e8ab Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev 2016-12-20 17:57:37 +00:00
Tony Mak
83dcc26065 DO NOT MERGE: Cross profile candidate should be considered
am: ff11122ddc

Change-Id: I9de28d980021579d70d85193b1994ddca042d4fa
2016-12-20 16:57:44 +00:00
Tony Mak
ff11122ddc DO NOT MERGE: Cross profile candidate should be considered
Bug: 32547783

Fixed the regression introduced in 8e2d9d1d90

Test: Manual test - Open a map link in work calendar, personal map is shown as an option.

Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
(cherry picked from commit 9f2c93663c)
2016-12-20 16:43:45 +00:00
phweiss
2f512047c2 DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
If a device owner is active, the layout is changed from a
standard AlertDialog with only one string to a custom dialog
that includes information on Device Owners, and VPN and Network Logging,
if enabled.

Cherry-picked from master and modified to not rely on changes that are not in
N:

A change in master renamed some variables in QSFooter.createDialog() and made
them final, this change is also included here.

The owner's organization name cannot be set in N.

In the case of active Device Owner and active VPN, there was a specialized
string for this in N. This string was now replaced by using the simpler
Device Owner string + an own entry for VPN in the new layout.

Some imports had to be included that were already there on master.

The dimen-tag throws an error message on floats during build, replaced by an
item-tag.

BUG: 29748723
BUG: 33126622
Test: Manual, CTS-Verifier tests will be added later

(cherry picked from commit 9e450e1233)

Change-Id: I2bfca9d9d02a42d9c3b17683625eda29e9369666
2016-12-20 17:11:01 +01:00
Hugo Benichi
2abde827c5 DO NOT MERGE Stricter NetworkNotificationManagerTest
am: a865790a5b

Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740
2016-12-20 06:49:08 +00:00
Jeremy Joslin
71909ea39a Merge "Implement the request and recommend calls." am: 1e814b3928 am: b50fdc7faa
am: 949893f5b2

Change-Id: Ibd03bace49bc277a2777c8483da6b4ebfc56d217
2016-12-20 06:37:11 +00:00
Jeremy Joslin
949893f5b2 Merge "Implement the request and recommend calls." am: 1e814b3928
am: b50fdc7faa

Change-Id: I81f998b6934715f43797247f411919a4ceee5631
2016-12-20 06:32:42 +00:00
Jeremy Joslin
b50fdc7faa Merge "Implement the request and recommend calls."
am: 1e814b3928

Change-Id: I91c905ab2fc7e061462fb96c2c81a783aa93a391
2016-12-20 06:25:08 +00:00
Treehugger Robot
1e814b3928 Merge "Implement the request and recommend calls." 2016-12-20 06:16:03 +00:00
Paul Stewart
cf03183241 Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
am: 7eaec196b7

Change-Id: I85c6652d8cdfc387b27fe2a11026c05b5df667a5
2016-12-20 05:04:55 +00:00
Paul Stewart
d0d9493102 DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
am: 8e21030679

Change-Id: I79c4129b861b9dd93ac14acce5a86aadd48e8d39
2016-12-20 05:04:46 +00:00
Joe LaPenna
5013035d95 DO NOT MERGE Fix malformed log statement.
am: 02ca23d9a2

Change-Id: Ie52f24f39305f325e01972f5046247482053db28
2016-12-20 05:04:02 +00:00
Hugo Benichi
a865790a5b DO NOT MERGE Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.

Test: verified that the test fails when reintroducing the format String
bug.
Bug: 33737715

Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a
2016-12-20 05:02:28 +00:00
TreeHugger Robot
7eaec196b7 Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
* changes:
  DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
  DO NOT MERGE Fix malformed log statement.
2016-12-20 04:58:54 +00:00
Jeremy Joslin
d0d32e238e Merge "Implement the discovery of a network recommendation provider." am: 470d256519 am: 8fbeb1d74a
am: af811c2650

Change-Id: I18d4c618f78796cbbe6d895c5b2f888c4a9a55ff
2016-12-20 03:37:58 +00:00
Jeremy Joslin
af811c2650 Merge "Implement the discovery of a network recommendation provider." am: 470d256519
am: 8fbeb1d74a

Change-Id: I322592326e0a409131a4dd33ab1f907b9262dbf2
2016-12-20 03:34:02 +00:00
Paul Stewart
8e21030679 DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Commit fb2609d3ee added a string
format which caused an exception.  On top of the fixes to this
from e140616718, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit 835cb49639)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36
2016-12-20 12:31:49 +09:00
Joe LaPenna
02ca23d9a2 DO NOT MERGE Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f

BUG: 33746580

Test: built, triggered notification, no crash.

(cherry picked from commit e140616718)

Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b
2016-12-20 12:31:45 +09:00
Jeremy Joslin
8fbeb1d74a Merge "Implement the discovery of a network recommendation provider."
am: 470d256519

Change-Id: I804df594669be3b42704dead7007790666bef0f6
2016-12-20 03:26:04 +00:00
Treehugger Robot
470d256519 Merge "Implement the discovery of a network recommendation provider." 2016-12-20 03:16:32 +00:00
Jeremy Joslin
36d4c48496 Implement the request and recommend calls.
Implemented requestRecommendation() and requestScores() to call
through to the bound network recommendation provider if available.

BUG: 33593157
BUG: 33668692
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I055251fa94d93d4ea4e5001c4ec6c1dfb626d1b2
Merged-In: I8e2ed73dc6876deb1a8bd47bcaeaca8db68f3a44
2016-12-19 17:53:47 -08:00
Jeremy Joslin
b8418ac89a Implement the discovery of a network recommendation provider.
Updated the NetworkScorerAppManager to examine the list of configured
network recommendation providers and to select the first valid
provider.

As part of this update the old logic of looking for a valid network
scorer has been removed. Scorers/recommendation providers are only
selected from the configured list now. The setActiveScorer() method
has been deprecated as a result.

The NetworkScoreService has been updated to monitor the list of
potential recommendation providers and to reevaluate the binding
whenever they change. It also monitors the new setting for
NETWORK_RECOMMENDATIONS_ENABLED to connect or disconnect from the
provider as needed.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33158362
Change-Id: I450981261aa5355c1c91ec2e3a0a3b58cc65316b
Merged-In: I42aeb5223da794f71f7e58cb1bdf18817200cbf2
2016-12-19 17:53:47 -08:00
Jeff Sharkey
bdf62c82c8 Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c am: d948865e27
am: e36f449c90

Change-Id: I818578f22a8988a141636694ae3811ad2d45f52e
2016-12-20 01:25:19 +00:00
Jeff Sharkey
e36f449c90 Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c
am: d948865e27

Change-Id: Iaf9d7f9a3f7d2fd34a11ec2ee80d849fc7dd0078
2016-12-20 01:18:38 +00:00
Jeff Sharkey
d948865e27 Merge "Remove ~1/3 of the installd calls at boot."
am: 5bc305b97c

Change-Id: Ia6af8d920971118f108320d08b15cbe3da59b28a
2016-12-20 01:14:35 +00:00
Chris Tate
c9db008a17 Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev
am: 793c634d1e

Change-Id: I11f490cd67f31816abf0ed4dbed481eb9b21d6cf
2016-12-20 01:10:22 +00:00
Christopher Tate
9ee86cb987 Migrate system+lock wallpaper to lock-only when setting live wp
am: 7cd0010df6

Change-Id: I488880ddcb04894d18535815691d32d542bc71c1
2016-12-20 01:10:16 +00:00
Treehugger Robot
5bc305b97c Merge "Remove ~1/3 of the installd calls at boot." 2016-12-20 01:06:23 +00:00
Chris Tate
793c634d1e Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev 2016-12-20 01:01:55 +00:00
Jeff Sharkey
1c6f723973 Remove ~1/3 of the installd calls at boot.
When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode.  Let's simplify this
and just return the inode number from the createAppData() call.

Test: builds, boots, reads CE inodes after wipe
Bug: 33463450
Change-Id: I9b73da576800b56d7d0961dd4deb0b6a546acbe7
2016-12-19 16:39:54 -07:00
Christopher Tate
7cd0010df6 Migrate system+lock wallpaper to lock-only when setting live wp
If the static imagery is shared between system+lock, preserve the lock
presentation when setting a different system-surface live wallpaper.  If
the caller knows it wants to achieve system+lock display of the new live
wallpaper, it follows up setWallpaperComponent() with an explicit clear
of the lock wallpaper state.

Previously, setting a new system live wallpaper would necessarily override
a desired static lock image in the case of system+lock shared imagery.
Now it doesn't.

Bug 32664317

Change-Id: I7ef2cded534f9e6e91899db4c37bd24efaf09fee
2016-12-19 14:38:44 -08:00
Jeremy Joslin
72624e0720 Merge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7
am: 5b1a460b94

Change-Id: I52289854a38a36929cd9b8d20e85b00346b3317c
2016-12-19 22:18:37 +00:00
Jeremy Joslin
5b1a460b94 Merge "Fix ScanResult array parceling." am: 5fdc86fb27
am: 68764eabb7

Change-Id: I6b44179d634722828f40524c26ccf6ea51521f11
2016-12-19 22:14:37 +00:00
Jeremy Joslin
68764eabb7 Merge "Fix ScanResult array parceling."
am: 5fdc86fb27

Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc
2016-12-19 22:07:20 +00:00
Treehugger Robot
5fdc86fb27 Merge "Fix ScanResult array parceling." 2016-12-19 21:57:05 +00:00
Joe LaPenna
71dd757c56 Merge "Remove "final" from ResultCallback." am: b60d7b334c am: 8df12d98f7
am: 8c5eb9b10f

Change-Id: I9a234d6176c441b424714dda1de4ec580a12e2c5
2016-12-19 21:13:31 +00:00
Wei Wang
27219ad9ec Merge "Start sensor service in a seperate thread" into nyc-mr2-dev
am: 9ec4256a17

Change-Id: I0956ba96241ccb9df18ba9f2bfd29cc952659b1a
2016-12-19 21:08:48 +00:00
Wei Wang
18d1398690 Start sensor service in a seperate thread
am: 6ba0ef31e8

Change-Id: I325b0d5c02326355c7b04962537e695e7839be09
2016-12-19 21:08:22 +00:00
Joe LaPenna
8c5eb9b10f Merge "Remove "final" from ResultCallback." am: b60d7b334c
am: 8df12d98f7

Change-Id: Ia0266003bff04bf0ec5b3ee7134678c1b1f0e77f
2016-12-19 21:07:29 +00:00
Mark Lu
52f065af6b Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am: cbfb58c9d7 am: 70fa908fb2
am: fa0c9f2352

Change-Id: I845121e5e638fff86c0915213cf3ce87fc914918
2016-12-19 21:05:45 +00:00
Mark Lu
ad9551617d docs: remove implicit intent from bindService and startService am: 94ebbe0e58 am: d7c29565ba
am: a8107e1074

Change-Id: I39ffafde9285c62d27cf1559d215dd687dbe4aec
2016-12-19 21:04:11 +00:00
Mark Lu
5356f60f27 docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241
am: 353e197a8a

Change-Id: I4b338888e82cd7e524db0f04b4a2cb3b725d1109
2016-12-19 21:02:57 +00:00
Brad Ebinger
2cafc11399 Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
am: 73dcab62b7  -s ours

Change-Id: Id30938ad8395a57b7a39becd3c7834df75b2ba07
2016-12-19 21:01:41 +00:00
Joe LaPenna
8df12d98f7 Merge "Remove "final" from ResultCallback."
am: b60d7b334c

Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
2016-12-19 21:01:26 +00:00
TreeHugger Robot
9ec4256a17 Merge "Start sensor service in a seperate thread" into nyc-mr2-dev 2016-12-19 20:59:15 +00:00
Brad Ebinger
721847320b Add UI prompt for MMI code failure on 3gpp
am: ac8d8e7358

Change-Id: Id83a2fa2dd958a0fbfcb2d5eb90528bcf96737b8
2016-12-19 20:54:27 +00:00
Treehugger Robot
b60d7b334c Merge "Remove "final" from ResultCallback." 2016-12-19 20:54:14 +00:00
Mark Lu
3d6a77afb5 Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am: cbfb58c9d7 am: 70fa908fb2
am: 6461737fa5

Change-Id: I37fab5a4733b27a359800cc4cf0f3982f209a8f8
2016-12-19 20:35:27 +00:00