Commit Graph

257996 Commits

Author SHA1 Message Date
Fyodor Kupolov
1dcfc423cd Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev 2017-01-20 18:18:01 +00:00
Fyodor Kupolov
83a218c416 [DO NOT MERGE] Do not report boot timings on first boot or runtime restart
During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.

The following metrics were updated:
 - framework_locked_boot_completed
 - framework_boot_completed
 
Cherry-picked from commit 1d87e40d42

Test: manual
Bug: 32807863
Change-Id: I9d545cf38118f45f3f13597df2949d0ae4abd26a
2017-01-20 17:32:50 +00:00
TreeHugger Robot
fb764b7035 Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev 2017-01-20 04:05:31 +00:00
Svet Ganov
a2bbc26979 Use separate switch ops for runtime permissions
am: e710a6fc66

Change-Id: I86cd237bffdde972de69b91fa086ac5f5ec349e8
2017-01-20 01:41:11 +00:00
Jiaquan He
90f4f5290b 2D Recents: round task thumbnails properly.
Test: Checked that on local sw600dp devices, task views are rounded with
8dp. Also checked that Recents works properly on phones.
Bug: 32101881

Change-Id: I6f7a09a12c3e3f1f7270bed1ae25b291fadfb8f2
2017-01-19 16:01:26 -08:00
Jiaquan He
44db90262e 2D Recents: handle keyboard config changes.
While attaching or detaching a physical keyboard, we should handle the
configuration change in RecentsActivity, so that the activity isn't
relaunched and causes abnormal behaviors.

Test: Checked that while keyboard is attached or detached, Recents
behaves normally.
Bug: 32101881

Change-Id: Ibd185aeb48b31dbde032e235fdcaa17fbcdd9c8a
2017-01-19 15:29:54 -08:00
TreeHugger Robot
683ea24d6e Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev 2017-01-19 19:36:44 +00:00
Svet Ganov
e710a6fc66 Use separate switch ops for runtime permissions
If permissions review is enabled we allow individual
control of fine graned permissions in the SMS group.
This change ensures these permissions use the
corresponding app op as a switch to allow indifidual
control.

Change-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112
(cherry picked from commit 99e4d51584)
2017-01-19 12:31:42 +00:00
TreeHugger Robot
18f1a35d46 Merge "Eschew unspecified IP addresses for DNS servers" into nyc-mr2-dev 2017-01-19 07:57:15 +00:00
Lorenzo Colitti
bb08c408a8 Merge "VPN reconnection fails after manually disabling VPN" into nyc-mr2-dev 2017-01-19 06:27:24 +00:00
Erik Kline
a19f9f281a Eschew unspecified IP addresses for DNS servers
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-wifi passes (though no test covers this code yet)
Bug: 34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
2017-01-19 15:27:08 +09:00
TreeHugger Robot
7c0a5220cb Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-19 04:43:49 +00:00
TreeHugger Robot
9ba372781e Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-19 04:43:06 +00:00
Hisanobu Watanabe
2b465d889c VPN reconnection fails after manually disabling VPN
When disabling VPN manually, there was no trigger for ipsec-tools to
send “delete message” to VPN server. Therefore, connection information
is left in VPN server and next connection fails.

Fix this issue as below:
- Add “delete message” sending via flush in ipsec-tools when racoon
  daemon stops
- Keep daemon alive when VPN.java exit() to let it finish sending to
  VPN server
- Move close(socket) and stop(daemon) in VPN.java execute()
  and monitorDaemons() to run() to gather cleaning block.

(cherry picked from commit 047454c759)

Change-Id: Ibfbd389b17de5b5a5d23cba59c8d1e05fbe12c15
Bug: 28279646
Bug: 33467086
2017-01-19 12:38:22 +09:00
Michael Wright
b1ccd81fba Merge "Validate custom pointer icons aren't null." into cw-f-dev
am: 05b2d3eb0d

Change-Id: I3a11e06dfe3f476b791838241bfb36e5362063ab
2017-01-19 02:16:46 +00:00
Michael Wright
92f7fab9f6 Validate custom pointer icons aren't null.
am: 35068079c8

Change-Id: I37fdde3c1ea735c4888760f3aab43caf7711dd0e
2017-01-19 02:16:42 +00:00
TreeHugger Robot
05b2d3eb0d Merge "Validate custom pointer icons aren't null." into cw-f-dev 2017-01-19 02:12:20 +00:00
TreeHugger Robot
12ea12aab5 Merge "2D Recents: polish the app -> recents transition" into nyc-mr2-dev 2017-01-19 01:26:03 +00:00
Bill Yi
61385acb7a Import translations. DO NOT MERGE
Change-Id: I5becba7c3473850f08ce948491d37b2cc2f5e35f
Auto-generated-cl: translation import
2017-01-18 17:06:36 -08:00
Bill Yi
c2eddc99cd Import translations. DO NOT MERGE
Change-Id: I0c14cd3eb5a5d0a4d1640458bcad2aa160cdddca
Auto-generated-cl: translation import
2017-01-18 16:57:28 -08:00
Daniel Nishi
1cf89cb8ee Merge "Remove the requirement of the --checkin flag." into nyc-mr2-dev 2017-01-19 00:33:16 +00:00
Manu Cornet
fc6ac0a78a 2D Recents: polish the app -> recents transition
* Do not draw the header as part of the transition thumbnail
  since the header is already shown. Just let the thumbnail
  slot into the task view already drawn on screen.
* Shift the target rectangle by the header height so that
  the end state of the animation corresponds exactly to the
  task view layout.
* Remove unused local variable.

Bug: 32101881
Bug: 33752154
Test: Checked/screencasted recents -> app -> recents animations on local sw600dp device
Change-Id: I4c8ce52b378567114735e6bd582572124a2a354c
2017-01-18 15:55:51 -08:00
TreeHugger Robot
81e8bdd420 Merge "2D Recents: use a different background color for drop targets" into nyc-mr2-dev 2017-01-18 23:51:35 +00:00
TreeHugger Robot
146f68a445 Merge "2D Recents: to and from home, animate task views as a block" into nyc-mr2-dev 2017-01-18 23:34:07 +00:00
Christine Franks
64a16be2ba Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev 2017-01-18 23:24:46 +00:00
TreeHugger Robot
32a16bada4 Merge "Add isChildDocument to MtpDocumentsProvider." into nyc-mr2-dev 2017-01-18 23:09:41 +00:00
TreeHugger Robot
4b2542315f Merge "Not create document under the device." into nyc-mr2-dev 2017-01-18 22:54:39 +00:00
Jiaquan He
c0e1813944 Add arrow key navigation support to Grid-based Recents.
Test: Checked that arrow key navigation works in Recents on local
sw600dp devices. Also checked that Recents works properly on phones.
Bug: 32101881

Change-Id: I8ece3fc4c9ae82916efcbbde72d40805e43cc70d
2017-01-18 14:17:54 -08:00
TreeHugger Robot
2a147464f6 Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev 2017-01-18 22:14:22 +00:00
TreeHugger Robot
a88749fb51 Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev 2017-01-18 22:06:22 +00:00
Svet Ganov
b6973a8c82 Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev
am: b8c8b67789  -s ours

Change-Id: I502a61cc0c1c6caaf18a7d0c03aa558541b3c17f
2017-01-18 21:04:21 +00:00
Svet Ganov
cf7b579868 DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am: 4a601f972a  -s ours

Change-Id: Id66c49cfa6010ab327f46e85a6940bd52102eeea
2017-01-18 21:04:19 +00:00
TreeHugger Robot
b8c8b67789 Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev 2017-01-18 20:57:11 +00:00
Manu Cornet
47dd7c51e9 2D Recents: use a different background color for drop targets
Bug: 32101881
Test: Checked layout and animations in Recents, on local sw600dp device.
Change-Id: I628bd0866691e5badd7a37c88020e1e10e1902f7
2017-01-18 12:54:03 -08:00
Michael Wright
35068079c8 Validate custom pointer icons aren't null.
Bug: 33853287
Test: cts
Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df
(cherry picked from commit b004b5137e)
2017-01-18 20:48:44 +00:00
Manu Cornet
45c8048f4f 2D Recents: to and from home, animate task views as a block
Bug: 32101881
Test: Checked animations to/from home on local sw600dp device
Change-Id: I74b8b02bb39be6d4e4553f7d74550ff177d47a5e
2017-01-18 11:33:59 -08:00
Svet Ganov
4a601f972a DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
Bug: 34193954

Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917
(cherry picked from commit 6130fb741c)
2017-01-18 11:10:15 -08:00
Kenny Guy
748e78bd2c Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed
am: 1894632864

Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
2017-01-18 17:47:02 +00:00
Christine Franks
b189aa6cf8 DO NOT MERGE - Fix demo mode reset notification
Bug: 34358856
Test: manually verified that tapping the Reset notification
triggers a reset after initial provisioning.

Change-Id: I7cf4db729384630a85b22ca9b4947198974a8fbf
2017-01-18 09:43:40 -08:00
Kenny Guy
1894632864 Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af
am: ee9f03d1ed

Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
2017-01-18 17:33:33 +00:00
Kenny Guy
ee9f03d1ed Fix issue with saving admins before finishing loading. am: f98ed6863a
am: b275a205af

Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
2017-01-18 17:27:10 +00:00
Kenny Guy
b275a205af Fix issue with saving admins before finishing loading.
am: f98ed6863a

Change-Id: I7f816c164548df86f9607c86772902efd0d53620
2017-01-18 17:13:31 +00:00
Tucker Sylvestro
eed0a7bf45 svc nfc should support watches too
am: 1876583bfb

Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
2017-01-18 16:34:50 +00:00
Tucker Sylvestro
1876583bfb svc nfc should support watches too
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command.  Watches may only have the latter, but should still
support the nfc enable/disable command.

See b/24532713#comment7 for context.

Bug 32386425

Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
2017-01-18 10:27:38 -05:00
Kenny Guy
f98ed6863a Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.

Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit adbda7474c)
2017-01-18 12:01:55 +00:00
Sunny Goyal
13f18efb8f Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev 2017-01-18 01:45:55 +00:00
Makoto Onuki
5e2634ba55 Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev 2017-01-18 01:26:59 +00:00
Kenny Guy
adbda7474c Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.

Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
2017-01-17 23:37:57 +00:00
Jiaquan He
21f495f07b Add keyboard support to Grid-based Recents.
Test: Checked that pressing tab, shift + tab, alt + tab, alt + shift +
tab work for task navigation in Recents on local sw600dp device. Also
checked that Recents on phones work properly.
Bug: 32101881
Change-Id: I3e4cd212d2900523ece30a85cae7fb73a9594efb
2017-01-17 15:34:09 -08:00
Svetoslav Ganov
70c0f5c2c7 Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0
am: df459cb2ea

Change-Id: I1239cde924e6d31222bf108c6d55ff19a78019ad
2017-01-17 23:03:42 +00:00