OSDN Git Service
Bill Yi [Thu, 12 Jan 2017 17:36:45 +0000 (17:36 +0000)]
Import translations. DO NOT MERGE am:
8c90b5ace0 -s ours
am:
349e01836f -s ours
Change-Id: I253aeb9193b6e9e24b02be1fd09de4fdf3a0bc4d
Andre Eisenbach [Thu, 12 Jan 2017 17:30:55 +0000 (17:30 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e am:
2d0ad3a9e7 am:
e81838f7e1
am:
efb1bda2d6
Change-Id: I8144d1e2c856304982679c35faa401f0aad5478f
Selim Cinek [Thu, 12 Jan 2017 17:28:47 +0000 (17:28 +0000)]
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev am:
c687aa08c1
am:
5736b1689a -s ours
Change-Id: I2be4e7e3f4b2830953e7f7b11994274c997f0b3e
Selim Cinek [Thu, 12 Jan 2017 17:27:44 +0000 (17:27 +0000)]
Allowing heads-up notifications now on the lock screen am:
ab24dc9f29
am:
f6c9c21745 -s ours
Change-Id: I7435ec86716e0beae9e4c429f12e9ab026360577
Selim Cinek [Thu, 12 Jan 2017 17:26:51 +0000 (17:26 +0000)]
Introduced the visual stability manager am:
add9526b1d
am:
85e481140c -s ours
Change-Id: I43f51b10146356ce03264f059338d6c1431715ed
Selim Cinek [Thu, 12 Jan 2017 17:25:58 +0000 (17:25 +0000)]
Removing notifications always immediately when swiping them away am:
5e018206e2
am:
fabd50de62 -s ours
Change-Id: I75b2f037bd925aa74db0a43a7513275aacdcfea2
Mark Salyzyn [Thu, 12 Jan 2017 17:22:56 +0000 (17:22 +0000)]
Merge "resolve merge conflicts of
ec7e2a164c37 to master"
Bill Yi [Thu, 12 Jan 2017 17:22:50 +0000 (17:22 +0000)]
Import translations. DO NOT MERGE
am:
8c90b5ace0 -s ours
Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
TreeHugger Robot [Thu, 12 Jan 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 17:20:05 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Thu, 12 Jan 2017 17:18:19 +0000 (17:18 +0000)]
Merge "Fix the build!"
Jeff Sharkey [Thu, 12 Jan 2017 17:16:27 +0000 (10:16 -0700)]
Fix the build!
Change-Id: I4200cbd0190b384a94a8b59988c19101b127cbf9
TreeHugger Robot [Thu, 12 Jan 2017 17:14:10 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 16:59:20 +0000 (16:59 +0000)]
Merge "Introduce set/getFontVariationSettings."
Jeff Sharkey [Wed, 11 Jan 2017 23:05:27 +0000 (16:05 -0700)]
Add support for fallback categories.
When an app doesn't define a category, look for a fallback category
in a hard-coded list. This change only defines a fallback for a
single package, but device-specific overlays can be used to provide
more detailed fallback lists.
The precidence order is: app manifest > installer hint > fallback
Test: builds, boots, fallback categories work
Bug:
33815939
Change-Id: I1f5ca76fb7e5743a4500c0a1230a754266f34d9e
Jeff Sharkey [Wed, 11 Jan 2017 18:25:50 +0000 (11:25 -0700)]
Add API for apps to declare their "category".
Upcoming platform features need to cluster apps together into broad
categories to help summarize information to users. (For example,
when presenting battery, network, and disk usage.)
We are tightly limiting the set of categories to keep them easily
presentable to users when summarizing information. This feature is
not designed to be a general-purpose taxonomy, nor should it be
allowed to become one.
Older apps may not have defined a category in their manifests, so
allow the installing app to define a category on their behalf.
Test: builds, boots
Bug:
33815939
Change-Id: I785b882ee7c18072ef47d56e0fc19ad72888e1b7
TreeHugger Robot [Thu, 12 Jan 2017 16:52:23 +0000 (16:52 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism"
Andre Eisenbach [Thu, 12 Jan 2017 16:48:15 +0000 (16:48 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e am:
2d0ad3a9e7
am:
e81838f7e1
Change-Id: I62d424e92e10c1604938349e94ae38938557130c
Andre Eisenbach [Thu, 12 Jan 2017 16:44:42 +0000 (16:44 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e
am:
2d0ad3a9e7
Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
Mark Salyzyn [Thu, 12 Jan 2017 16:27:11 +0000 (08:27 -0800)]
resolve merge conflicts of
ec7e2a164c37 to master
Test: compile
Bug:
26552300
Bug:
31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5
Andre Eisenbach [Thu, 12 Jan 2017 16:27:03 +0000 (16:27 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
am:
0b9a18d21e
Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
Selim Cinek [Thu, 12 Jan 2017 16:14:47 +0000 (16:14 +0000)]
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
am:
c687aa08c1
Change-Id: I99ba4164acbb902f8037859fea4654691e834c81
Selim Cinek [Thu, 12 Jan 2017 16:14:34 +0000 (16:14 +0000)]
Allowing heads-up notifications now on the lock screen
am:
ab24dc9f29
Change-Id: I7677c513dba5d787e44bdd73b3cc5d9c004305f5
Selim Cinek [Thu, 12 Jan 2017 16:13:47 +0000 (16:13 +0000)]
Introduced the visual stability manager
am:
add9526b1d
Change-Id: I4a8ff70995585461d84ce6a4a3976104e7465547
Selim Cinek [Thu, 12 Jan 2017 16:13:00 +0000 (16:13 +0000)]
Removing notifications always immediately when swiping them away
am:
5e018206e2
Change-Id: I09f3b3a2f793b10b7c9c39e96b26a89992a1314a
Mark Salyzyn [Thu, 12 Jan 2017 15:59:48 +0000 (15:59 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am:
2225a0640b am:
d1740f0f5b
am:
6dacea63d9
Change-Id: Ife229cc450dbbb5f43941fcd1b08b86f0e41a779
Andre Eisenbach [Thu, 12 Jan 2017 15:58:36 +0000 (15:58 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
Andre Eisenbach [Thu, 12 Jan 2017 15:56:39 +0000 (15:56 +0000)]
Revert "Don't offer the BT sharing option to the user if BT is disallowed."
Causes boot loop issue:
02-15 02:31:59.785 770 770 E System : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785 770 770 E System : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785 770 770 E System : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785 770 770 E System : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785 770 770 E System : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)
This reverts commit
77fe44ffb6b5d40daf3b127cb36d5111b7618cc1.
Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24
Selim Cinek [Thu, 12 Jan 2017 15:55:26 +0000 (15:55 +0000)]
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
* changes:
Allowing heads-up notifications now on the lock screen
Introduced the visual stability manager
Removing notifications always immediately when swiping them away
Mark Salyzyn [Thu, 12 Jan 2017 15:46:20 +0000 (15:46 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am:
2225a0640b
am:
d1740f0f5b
Change-Id: I78430cd21cf1186ccc2b48ee4ee8a9b07decde5e
Mark Salyzyn [Thu, 12 Jan 2017 15:32:50 +0000 (15:32 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
am:
2225a0640b
Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
Mark Salyzyn [Thu, 12 Jan 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
Michal Karpinski [Thu, 12 Jan 2017 14:45:01 +0000 (14:45 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism
The full batch will still be available to DPC if there were no
network logs pending.
Added some more debug logging to better investigate the issues.
Test: manual for both cases - pending batch was empty and non-empty,
with locally decreased timeout
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Bug:
34157435
Bug:
29748723
Change-Id: Iee229d74d4b0a06025b305a15687f336a0aa337e
TreeHugger Robot [Thu, 12 Jan 2017 15:01:49 +0000 (15:01 +0000)]
Merge "Fix NPE when trying to add starting window"
TreeHugger Robot [Thu, 12 Jan 2017 14:01:22 +0000 (14:01 +0000)]
Merge "Remove PO support from HardwarePropertiesManager"
TreeHugger Robot [Thu, 12 Jan 2017 13:46:05 +0000 (13:46 +0000)]
Merge "[DPM] Allow lower strong auth timeout on debuggable builds"
Jorim Jaggi [Thu, 12 Jan 2017 12:54:40 +0000 (13:54 +0100)]
Fix NPE when trying to add starting window
Container may already have been removed, so protect against that
situation.
Test: Boot device
Change-Id: Ic76d74c6df0801e2a50352a4b04d67b5d216d4fe
Fixes:
34227241
Bill Yi [Thu, 12 Jan 2017 13:23:03 +0000 (05:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6daeaa7d995e86318f60d1bb0e1094f9bcdd9709
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a am:
3556fd53a2 am:
95322ffdde
am:
4103219402
Change-Id: Iadadfa8f8be5539fffa27c89ab7ebb74ada694e4
Bill Yi [Thu, 12 Jan 2017 11:41:01 +0000 (03:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6119a209e99f4e301961a07b18b181b8069cfd3e
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:39:05 +0000 (11:39 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a am:
3556fd53a2
am:
95322ffdde
Change-Id: Ibc624034478689ad1208e5da15835a6acd2d796a
Michal Karpinski [Wed, 14 Dec 2016 13:47:37 +0000 (13:47 +0000)]
[DPM] Allow lower strong auth timeout on debuggable builds
Timeout can be set to lower than 1h on debuggable builds (eng, user-debug)
using persist.sys.min_str_auth_timeo system property. This allows manual
testers to more easily carry out testing scenarios.
Bug:
29825955
Test: manual without setting the property: if timeout is set to less than 1h, it's clamped to 1h
Test: manual with setting the property: on user-debug build with "adb root && adb shell setprop persist.sys.min_str_auth_timeo 30000"
Change-Id: I8cd871e3d04b2c6c7164f684b9a6a24e7292bfab
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:33:15 +0000 (11:33 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a
am:
3556fd53a2
Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:27:32 +0000 (11:27 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d"
am:
c0d71fa38a
Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901
Treehugger Robot [Thu, 12 Jan 2017 11:20:05 +0000 (11:20 +0000)]
TreeHugger Robot [Thu, 12 Jan 2017 11:13:33 +0000 (11:13 +0000)]
Merge "Modify WifiNetworkScoreCache to print full Score."
Pavel Grafov [Thu, 12 Jan 2017 11:11:57 +0000 (11:11 +0000)]
Merge "Let profile owners also receive OTA notification."
Pavel Grafov [Thu, 12 Jan 2017 11:08:50 +0000 (11:08 +0000)]
Merge "Fix DevicePolicyManagerServiceMigrationTest."
Erik Kline [Thu, 12 Jan 2017 10:49:31 +0000 (10:49 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b am:
cbd3d8b356 am:
082263344a
am:
190d8591ce
Change-Id: I255691753279b370e85c4bde1930b7e2f45cd109
Martijn Coenen [Thu, 12 Jan 2017 10:44:38 +0000 (10:44 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb am:
aa4d6f1be9 am:
eed50c1809
am:
cfc4e21899
Change-Id: I0478ca20b670f7ddd776ea98f3d5d1db928842ac
Erik Kline [Thu, 12 Jan 2017 10:43:26 +0000 (10:43 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b am:
cbd3d8b356
am:
082263344a
Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a
Bill Yi [Thu, 12 Jan 2017 10:41:59 +0000 (02:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id49c8f367fafd803a9ce3f2f7fbd8c5b9c6dc7bc
Auto-generated-cl: translation import
Martijn Coenen [Thu, 12 Jan 2017 10:38:28 +0000 (10:38 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb am:
aa4d6f1be9
am:
eed50c1809
Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076
Erik Kline [Thu, 12 Jan 2017 10:33:24 +0000 (10:33 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b
am:
cbd3d8b356
Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0
Martijn Coenen [Thu, 12 Jan 2017 10:31:35 +0000 (10:31 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb
am:
aa4d6f1be9
Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
Erik Kline [Thu, 12 Jan 2017 10:26:43 +0000 (10:26 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
am:
f9f5cf9d9b
Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
Martijn Coenen [Thu, 12 Jan 2017 10:25:01 +0000 (10:25 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
am:
34ed84d4eb
Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
Treehugger Robot [Thu, 12 Jan 2017 10:18:24 +0000 (10:18 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
Bill Yi [Thu, 12 Jan 2017 10:10:06 +0000 (02:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a0905f0339bd6d14aecff9491cf17453a4f90ed
Auto-generated-cl: translation import
Sundeep Ghuman [Thu, 12 Jan 2017 00:54:08 +0000 (16:54 -0800)]
Modify WifiNetworkScoreCache to print full Score.
Test: dumped network_score and verified printout
Change-Id: I3689449db91e8c5e96bed349749f074c5626bd03
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 09:40:47 +0000 (09:40 +0000)]
Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d
java.util.regex named group capture support.
Test: vogar OldMatcherTest
Bug:
19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29
Seigo Nonaka [Wed, 30 Nov 2016 22:04:21 +0000 (14:04 -0800)]
Introduce set/getFontVariationSettings.
This CL enables developers to specify axis values to the underlying
font collection. The specification of the font variation settings is
the same as the CSS font-variation-settings attribute in CSS working
draft as of 2016-11-30.
Code example: Here is an example to set width 100 and weight 1.5.
TextView tv = (TextView) findViewById(R.id.textView);
tv.setFontVariationSettings("'wdth' 100, 'wght' 1.5");
Bug:
33062398
Test: Manually done. Ran FrameworksGraphicsTests, CtsGraphicsTestCases
and CtsWidgetTestCases
Change-Id: I249d464f8cdaa56017a987588b94ed685aadeb58
Hugo Benichi [Thu, 12 Jan 2017 09:06:28 +0000 (09:06 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev am:
c45082266f
am:
f32a9f72d0
Change-Id: I62c0ab068b1304a1dbe7edbae29e5e74d8c34e08
Hugo Benichi [Thu, 12 Jan 2017 09:05:25 +0000 (09:05 +0000)]
Captive portal: better detect empty responses am:
cb4aa4d412
am:
3d5357ba2d
Change-Id: I3982ce4485d94c4abcf6afb2c58aa94a2ff2c902
Hugo Benichi [Thu, 12 Jan 2017 08:59:33 +0000 (08:59 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev
am:
c45082266f
Change-Id: Ice8b5df87baf475ebc4eb8f2eb4fe0150c938639
Hugo Benichi [Thu, 12 Jan 2017 08:59:27 +0000 (08:59 +0000)]
Captive portal: better detect empty responses
am:
cb4aa4d412
Change-Id: I64a006f6bb83dc588b108395d54189bb401c83ff
TreeHugger Robot [Thu, 12 Jan 2017 08:51:31 +0000 (08:51 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jan 2017 07:43:49 +0000 (07:43 +0000)]
Merge "Follow minikin::FontFamily constructor signature change."
Stephen Chen [Thu, 12 Jan 2017 07:39:50 +0000 (07:39 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366 am:
0e7882f2ac am:
272e70bf69
am:
50b0979972 -s ours
Change-Id: I6c96fa4a4033be5236f00082e3c7000a7061dbe9
TreeHugger Robot [Thu, 12 Jan 2017 07:33:44 +0000 (07:33 +0000)]
Merge "Add networkrecommendation permissions to privapp perms list."
Stephen Chen [Thu, 12 Jan 2017 07:33:19 +0000 (07:33 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366 am:
0e7882f2ac
am:
272e70bf69
Change-Id: I2bc76076e613566111404c55faefaeda9048f2d1
Stephen Chen [Thu, 12 Jan 2017 07:27:22 +0000 (07:27 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366
am:
0e7882f2ac
Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
Stephen Chen [Thu, 12 Jan 2017 07:21:49 +0000 (07:21 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
am:
691ebe5366
Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.
However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.
When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.
This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.
Test: build, flashed + manual tests.
Bug:
33498325
Change-Id: Ie2e5c6a9dc3740e4a2304034879b5ed60f277ade
Seigo Nonaka [Thu, 12 Jan 2017 06:02:55 +0000 (06:02 +0000)]
Merge "Check the count of the families in a default collection."
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.
Bug:
33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
Colin Cross [Thu, 12 Jan 2017 05:16:47 +0000 (05:16 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad am:
301c714b43 am:
dcb0c55c15
am:
9d273bfec1 -s ours
Change-Id: I2c890897639f807e8f8cdd2217d6f3cf13833b4e
Colin Cross [Thu, 12 Jan 2017 05:11:47 +0000 (05:11 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad am:
301c714b43
am:
dcb0c55c15
Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c
TreeHugger Robot [Thu, 12 Jan 2017 05:11:23 +0000 (05:11 +0000)]
Merge "Converting action bars to clusters."
Colin Cross [Thu, 12 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad
am:
301c714b43
Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
Colin Cross [Thu, 12 Jan 2017 04:59:42 +0000 (04:59 +0000)]
Merge "Remove libservicestestsjni"
am:
d00478e9ad
Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
Roozbeh Pournader [Thu, 12 Jan 2017 04:58:07 +0000 (04:58 +0000)]
Merge "Rename language+country resources to just language"
Joe LaPenna [Thu, 12 Jan 2017 04:54:03 +0000 (20:54 -0800)]
Add networkrecommendation permissions to privapp perms list.
Bug:
34235587
Test: Flashed and checked logcat for crash.
Change-Id: Ib35070ea87e23a3be8804eb3796e02c76a5628d0
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"
Erik Kline [Wed, 11 Jan 2017 08:34:50 +0000 (17:34 +0900)]
Simplify UpstreamNetworkMonitor callback handling
In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.
No semantic change, just a bit cleaner.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- tested basic wifi-to-mobile tethering (no DUN)
Bug:
32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1
TreeHugger Robot [Thu, 12 Jan 2017 04:19:13 +0000 (04:19 +0000)]
Merge "API for setting default focus per cluster."
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.
Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from
e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
Shijian Li [Thu, 12 Jan 2017 03:19:33 +0000 (03:19 +0000)]
Merge "Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
ae21066a59" into nyc-mr2-dev-plus-aosp
am:
8ec5d822c1
Change-Id: Ida281cd80308107dc02bf2b282d1a00ccfdb51c5
Shijian Li [Thu, 12 Jan 2017 03:19:25 +0000 (03:19 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
ae21066a59
am:
f8d62ca359
Change-Id: I4c4130790fbfc56cb952fc076fd2be611bf51b1f
Shijian Li [Thu, 12 Jan 2017 03:18:09 +0000 (03:18 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
699e7878ef
am:
7eed086b86
Change-Id: I33321847b4e945498bf4ca4c9840605cd9d31947
Android Build Merger (Role) [Thu, 12 Jan 2017 03:13:04 +0000 (03:13 +0000)]
Merge "Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
ae21066a59" into nyc-mr2-dev-plus-aosp
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8
am:
ae21066a59
Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8
am:
699e7878ef
Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
Shijian Li [Thu, 12 Jan 2017 03:07:10 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf
TreeHugger Robot [Thu, 12 Jan 2017 02:55:12 +0000 (02:55 +0000)]
Merge "Remove libservicestestsjni"
Yifan Hong [Thu, 12 Jan 2017 02:20:03 +0000 (02:20 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15 am:
e0707f139d am:
860ef8810d
am:
be7a9b89f4
Change-Id: Iac121abc1603f4739a61b8efc6ce7361656d16ba
Tim Murray [Thu, 12 Jan 2017 02:14:18 +0000 (02:14 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev am:
0b7b79a882
am:
d8ecc93ca0
Change-Id: I89b73e795813f4ed251b8612d9058c5d20c30841