OSDN Git Service

android-x86/frameworks-base.git
7 years agoMove the movies metrics constant back into O.
Daniel Nishi [Fri, 7 Apr 2017 21:25:17 +0000 (14:25 -0700)]
Move the movies metrics constant back into O.

Test: None
Change-Id: I101c334973476af84ddfb76589c851fbb1f82426

7 years agoMerge "renaming/removing fingerprints should be reflected in UI immediately" into...
Kevin Chyn [Fri, 7 Apr 2017 21:08:56 +0000 (21:08 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev am: 1a199ba7e1
am: 7b1e255bff

Change-Id: I7508c6e731acf54e71a40b840aba3acad3eadf48

7 years agoMerge "renaming/removing fingerprints should be reflected in UI immediately" into...
Kevin Chyn [Fri, 7 Apr 2017 21:00:58 +0000 (21:00 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am: 1a199ba7e1

Change-Id: Ie74c7067b38d1e34e5fbc3b3d83cbf692f444a53

7 years agoMerge "renaming/removing fingerprints should be reflected in UI immediately" into...
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev

7 years agoMerge "Add hidden API to check support of Multi-Display" into oc-dev am: 4eab3cb11a
Andrii Kulian [Fri, 7 Apr 2017 20:35:50 +0000 (20:35 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev am: 4eab3cb11a
am: b7c802094b

Change-Id: Icb5882f5e6e5b1a8054a8bd9889d46fc403bee98

7 years agoMerge "Add hidden API to check support of Multi-Display" into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 20:30:17 +0000 (20:30 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
am: 4eab3cb11a

Change-Id: I93855ada112e51892d5978c23de506388593aa9e

7 years agoMerge "FingerprintService: check current user correctly" into oc-dev am: 23a7c1e870
Charles He [Fri, 7 Apr 2017 20:25:56 +0000 (20:25 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev am: 23a7c1e870
am: 54b6116457

Change-Id: Ica03cfdb53899ef3a4c36908038581761c0641f0

7 years agoMerge "Add hidden API to check support of Multi-Display" into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 20:22:54 +0000 (20:22 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev

7 years agoMerge "FingerprintService: check current user correctly" into oc-dev
Charles He [Fri, 7 Apr 2017 20:16:20 +0000 (20:16 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
am: 23a7c1e870

Change-Id: I10b10af2f7caac3bfd2ec9b28335fdf4a1647b2c

7 years agoMerge "FingerprintService: check current user correctly" into oc-dev
Charles He [Fri, 7 Apr 2017 20:06:16 +0000 (20:06 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev

7 years agoMerge "Special-case English for DateTime and Time key listeners" into oc-dev am:...
Roozbeh Pournader [Fri, 7 Apr 2017 19:39:54 +0000 (19:39 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev am: 91d289903c
am: 300d74e34e

Change-Id: Ic6dfb3e20ef409d9ef7e63578d8db25013537046

7 years agoMerge "Special-case English for DateTime and Time key listeners" into oc-dev
Roozbeh Pournader [Fri, 7 Apr 2017 19:32:45 +0000 (19:32 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev
am: 91d289903c

Change-Id: Ibeaea13b146e30b5f7d67c49295081632a6a7736

7 years agoMerge "Revert "Do not make strong reference to Resources."" into oc-dev am: 2f2e3f8ad5
Wale Ogunwale [Fri, 7 Apr 2017 19:23:57 +0000 (19:23 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev am: 2f2e3f8ad5
am: d8351abc88

Change-Id: I7e5a4d46a4a524f2a7196adc9f39e27aced5bbdd

7 years agoMerge "Special-case English for DateTime and Time key listeners" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 19:21:51 +0000 (19:21 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev

7 years agoMerge "Revert "Do not make strong reference to Resources."" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 19:14:41 +0000 (19:14 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev
am: 2f2e3f8ad5

Change-Id: I4b2f25475531003f8a4928e0b4a8eef05dfb9378

7 years agoMerge "Revert "Do not make strong reference to Resources."" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 19:06:50 +0000 (19:06 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev

7 years agoMerge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc...
Ying Xu [Fri, 7 Apr 2017 18:59:33 +0000 (18:59 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev am: 98852767b3
am: 50a7cdc684

Change-Id: I5438622a7bdcc5e0006cc49995cc176abba17eed

7 years agoMerge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
Ying Xu [Fri, 7 Apr 2017 18:55:11 +0000 (18:55 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
am: 98852767b3

Change-Id: Ia7f57e10f3783a4bf7b711a347c6e64170d64f96

7 years agoMerge "Color management, the missing pieces" into oc-dev am: 7dfa16c2ef
Romain Guy [Fri, 7 Apr 2017 18:48:57 +0000 (18:48 +0000)]
Merge "Color management, the missing pieces" into oc-dev am: 7dfa16c2ef
am: 3eafcb2d8b

Change-Id: I079d8d17982eecc022f2a53e1e6ca193dc7a3ace

7 years agoMerge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
Ying Xu [Fri, 7 Apr 2017 18:47:54 +0000 (18:47 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev

7 years agoRevert "Do not make strong reference to Resources."
Bryce Lee [Fri, 7 Apr 2017 18:42:23 +0000 (18:42 +0000)]
Revert "Do not make strong reference to Resources."

This reverts commit 2d2315a66d81d29896e6a0ffedbfbbed3981b9ed.

Reason for revert: possible cause for b/37156733

Change-Id: I02d468449f0632d1281ab5ad2a381e7e36a5b0ea

7 years agoMerge "Make a11y node info parceling more robust"
Phil Weaver [Fri, 7 Apr 2017 18:42:22 +0000 (18:42 +0000)]
Merge "Make a11y node info parceling more robust"

7 years agoMerge "Color management, the missing pieces" into oc-dev
Romain Guy [Fri, 7 Apr 2017 18:41:50 +0000 (18:41 +0000)]
Merge "Color management, the missing pieces" into oc-dev
am: 7dfa16c2ef

Change-Id: I258ae87aeb739f3df1d1aef00fb055861c757111

7 years agoMerge "Color management, the missing pieces" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Color management, the missing pieces" into oc-dev

7 years agoMerge "Don't delete new notification channels not present in backup" into oc-dev...
Geoffrey Pitsch [Fri, 7 Apr 2017 18:32:09 +0000 (18:32 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev am: 9394a8fc62
am: 0271fbdaf9

Change-Id: Ia9ae659c2994cc4101385bba8cc06db073e8f026

7 years agoMerge "Don't delete new notification channels not present in backup" into oc-dev
Geoffrey Pitsch [Fri, 7 Apr 2017 18:28:45 +0000 (18:28 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev
am: 9394a8fc62

Change-Id: Iae8d9273ede243c9261ace763dc321a6196e302f

7 years agoMerge "Remove WebView-fallback code for handling the non-functional stub." into oc...
Gustav Sennton [Fri, 7 Apr 2017 18:28:08 +0000 (18:28 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev am: fc33499c64
am: feb6cf4aa1

Change-Id: I02691db9d70fb04643c9c683044ad14e5263e2ef

7 years agoMerge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
Gustav Sennton [Fri, 7 Apr 2017 18:22:05 +0000 (18:22 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
am: fc33499c64

Change-Id: Iefa63e6d00a10647457d197c02975442fade34d7

7 years agoMerge "Don't delete new notification channels not present in backup" into oc-dev
Geoffrey Pitsch [Fri, 7 Apr 2017 18:16:30 +0000 (18:16 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev

7 years agoMerge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 18:13:22 +0000 (18:13 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev

7 years agoAdd hidden API to check support of Multi-Display
Andrii Kulian [Fri, 7 Apr 2017 17:54:00 +0000 (10:54 -0700)]
Add hidden API to check support of Multi-Display

Added ActivityManager#supportsMultiDisplay() to check if system
supports running activities on secondary displays.

Bug: 36776777
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMultiDisplayDisabled
Change-Id: I18f98f2f6a9e865ad8dc63a470210190536d3271

7 years agoMerge "Fix theming on brightness dialog" into oc-dev am: 3d82322c7c
Jason Monk [Fri, 7 Apr 2017 17:54:59 +0000 (17:54 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev am: 3d82322c7c
am: e241a3c15a

Change-Id: I3fb8f87e6aa6e17e3d0478dc3d9569d1a927fd90

7 years agoMerge "NetworkPolicyManagerService: use hasRule()"
TreeHugger Robot [Fri, 7 Apr 2017 17:52:29 +0000 (17:52 +0000)]
Merge "NetworkPolicyManagerService: use hasRule()"

7 years agoMerge "Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am...
Android Build Merger (Role) [Fri, 7 Apr 2017 17:50:16 +0000 (17:50 +0000)]
Merge "Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am: 2d691791e7 am: df8508de66"

7 years agoMerge "Make visible only accounts for which authenticator supports contacts operation...
Dmitry Dementyev [Fri, 7 Apr 2017 17:49:31 +0000 (17:49 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission."

7 years agoMerge "Fix theming on brightness dialog" into oc-dev
Jason Monk [Fri, 7 Apr 2017 17:49:33 +0000 (17:49 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev
am: 3d82322c7c

Change-Id: I6c7e8a47686d5f3cfa1f4e235ef1bbb94dd753a7

7 years agoMerge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am: 2d691791e7
Adrian Roos [Fri, 7 Apr 2017 17:49:32 +0000 (17:49 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am: 2d691791e7
am: df8508de66

Change-Id: I648fcad9860b469003406c8892cf834a00b4b63d

7 years agoMerge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
Adrian Roos [Fri, 7 Apr 2017 17:43:08 +0000 (17:43 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
am: 2d691791e7

Change-Id: If8de068e9e42dc8ccac513c3ad624ef38c6ac1dc

7 years agoMerge "Make sure to synchronize on references to plugin dependencies" into oc-dev...
Jason Monk [Fri, 7 Apr 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev am: 157017c8a8
am: 84dbc7b20e

Change-Id: I4567c0db96817f6c78e2983ef226b8bd7dc3707f

7 years agoMerge "Synchronize on sysui dependency references" into oc-dev am: ed8051b528
Jason Monk [Fri, 7 Apr 2017 17:38:34 +0000 (17:38 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev am: ed8051b528
am: 5d6deab0c1

Change-Id: Ice2201ac3eb120f52c821881bc04fdb43e7ae579

7 years agoMerge "Fix theming on brightness dialog" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 17:37:46 +0000 (17:37 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev

7 years agoMerge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
Adrian Roos [Fri, 7 Apr 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev

7 years agoMerge "Make sure to synchronize on references to plugin dependencies" into oc-dev
Jason Monk [Fri, 7 Apr 2017 17:32:19 +0000 (17:32 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev
am: 157017c8a8

Change-Id: Ia6feb2f2e41ce6f4551cd6cd8713e09b0f5c5275

7 years agoMerge "Synchronize on sysui dependency references" into oc-dev
Jason Monk [Fri, 7 Apr 2017 17:31:05 +0000 (17:31 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev
am: ed8051b528

Change-Id: Ica1d06c345112b7632c9892576edc0c7352ba2bb

7 years agoMerge "Make sure to synchronize on references to plugin dependencies" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 17:24:57 +0000 (17:24 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev

7 years agoMerge "Synchronize on sysui dependency references" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 17:23:31 +0000 (17:23 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev

7 years agoMerge "AOD: More VisD updates" into oc-dev am: 67ee79e84f
Adrian Roos [Fri, 7 Apr 2017 16:18:42 +0000 (16:18 +0000)]
Merge "AOD: More VisD updates" into oc-dev am: 67ee79e84f
am: 1ac141639e

Change-Id: I2216b17f6a2dc585e088940d405ab2d42552acad

7 years agoMerge changes If96c0146,I0d68ad60 into oc-dev am: 5393a0e2d9
Selim Cinek [Fri, 7 Apr 2017 16:17:44 +0000 (16:17 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev am: 5393a0e2d9
am: e1fcf8edd6

Change-Id: I59b73215058df60ad93e59a76f01143c6a935d30

7 years agoMerge "AOD: More VisD updates" into oc-dev
Adrian Roos [Fri, 7 Apr 2017 16:14:34 +0000 (16:14 +0000)]
Merge "AOD: More VisD updates" into oc-dev
am: 67ee79e84f

Change-Id: Ie88590d0e098ef447c26cabb230cbf67aadcbb17

7 years agoMerge "remove deprecated API sendDialerCode" into oc-dev am: 31fcda576f
Chen Xu [Fri, 7 Apr 2017 16:12:54 +0000 (16:12 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev am: 31fcda576f
am: 6fd0d2b37f

Change-Id: I8239752191b094626e85935dcc6470a297742317

7 years agoMerge changes If96c0146,I0d68ad60 into oc-dev
Selim Cinek [Fri, 7 Apr 2017 16:08:26 +0000 (16:08 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
am: 5393a0e2d9

Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de

7 years agoMerge "AOD: More VisD updates" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 16:03:29 +0000 (16:03 +0000)]
Merge "AOD: More VisD updates" into oc-dev

7 years agoMerge "remove deprecated API sendDialerCode" into oc-dev
Chen Xu [Fri, 7 Apr 2017 16:03:02 +0000 (16:03 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
am: 31fcda576f

Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531

7 years agoMerge changes If96c0146,I0d68ad60 into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 15:59:12 +0000 (15:59 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev

* changes:
  Improved accessibility behavior of the notification shelf
  Fixed a bug where the indeterminate progressbar janky

7 years agoMerge "remove deprecated API sendDialerCode" into oc-dev
Chen Xu [Fri, 7 Apr 2017 15:53:07 +0000 (15:53 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev

7 years agoMerge "Check component before notifying activity is visible." into oc-dev am: 13acf25cfd
Bryce Lee [Fri, 7 Apr 2017 15:11:51 +0000 (15:11 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev am: 13acf25cfd
am: 6b8907d8ed

Change-Id: Ife37bdfb4bee6479688defad0446efaecfb7838b

7 years agoMerge "Removed unused variables in PerformBackupTask#finalizeBackup()"
TreeHugger Robot [Fri, 7 Apr 2017 15:07:11 +0000 (15:07 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()"

7 years agoMerge "Check component before notifying activity is visible." into oc-dev
Bryce Lee [Fri, 7 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
am: 13acf25cfd

Change-Id: I58d215ae33994274a364ec71ba59bae25e0e1c12

7 years agoMerge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev...
Michal Karpinski [Fri, 7 Apr 2017 15:00:01 +0000 (15:00 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev am: ce7f931793
am: 5c71bdf14d

Change-Id: I6596a7438a967416753d96aa6807d87d78fb4a7b

7 years agoMerge "Check component before notifying activity is visible." into oc-dev
Bryce Lee [Fri, 7 Apr 2017 14:58:13 +0000 (14:58 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev

7 years agoColor management, the missing pieces
Romain Guy [Wed, 5 Apr 2017 02:38:50 +0000 (19:38 -0700)]
Color management, the missing pieces

Implement missing color management pieces for bitmaps:

- Bitmap.createBitmap(Bitmap src, ...) now creates a bitmap
  in the same color space as the source bitmap
- Bitmap.createScaledBitmap() now creates a bitmap in the
  same color space as the source bitmap
- Bitmap.createBitmap(..., ColorSpace colorSpace) to create
  bitmaps in a specific color space
- Fix copy from A8 to F16
- Copying bitmaps in F16 or with a color space does not work,
  it's currently a limitation in Skia

Bug: 36905374
Test: BitmapColorSpaceTest
Change-Id: I0092fe4432511db50daa3a9393389a9db05e0c2a

7 years agoMerge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
Michal Karpinski [Fri, 7 Apr 2017 14:51:29 +0000 (14:51 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
am: ce7f931793

Change-Id: I40667aac08e8c6c5d2e31640a4667ea577cc8889

7 years agoMerge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 14:45:42 +0000 (14:45 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev

7 years agoMerge "Expose package_verifier_user_consent to Instant Apps" into oc-dev am: ca73ff016f
Chad Brubaker [Fri, 7 Apr 2017 14:28:34 +0000 (14:28 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev am: ca73ff016f
am: c6ef0585e8

Change-Id: I384d3f9d1e5a68426fd1ce69eb5dc6266891d84b

7 years agoMerge "Fix format for VR virtual display backing buffers" into oc-dev am: 1daf6cca42
Daniel Nicoara [Fri, 7 Apr 2017 14:27:27 +0000 (14:27 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev am: 1daf6cca42
am: 724d05cf9c

Change-Id: I8c27dd238e38daeeb27b1cc083730309e167319d

7 years agoMerge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 14:20:35 +0000 (14:20 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
am: ca73ff016f

Change-Id: Ife1762e223269271110b5f2357edffaaeb013b1b

7 years agoMerge "Fix format for VR virtual display backing buffers" into oc-dev
Daniel Nicoara [Fri, 7 Apr 2017 14:19:25 +0000 (14:19 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
am: 1daf6cca42

Change-Id: I1daad51d1b0d559e490da30510ba7aa99979666f

7 years agoMerge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 14:12:02 +0000 (14:12 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev

7 years agoMerge "Fix format for VR virtual display backing buffers" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 14:11:35 +0000 (14:11 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev

7 years agoMerge "Change requestWait API according to request" into oc-dev am: ca687ac39a
Philip P. Moltmann [Fri, 7 Apr 2017 13:35:50 +0000 (13:35 +0000)]
Merge "Change requestWait API according to request" into oc-dev am: ca687ac39a
am: a89137545b

Change-Id: I918d16f7dd81ec641b023f3a19a0c3aeab984e1d

7 years agoMerge "Change requestWait API according to request" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 13:27:33 +0000 (13:27 +0000)]
Merge "Change requestWait API according to request" into oc-dev
am: ca687ac39a

Change-Id: I19a3ca83efc1934448e1044b9be74087f89dd030

7 years agoMerge "Add managed profile whitelist to control NotificationListenerServices"
Esteban Talavera [Fri, 7 Apr 2017 13:26:26 +0000 (13:26 +0000)]
Merge "Add managed profile whitelist to control NotificationListenerServices"

7 years agoMerge "Change requestWait API according to request" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 13:19:04 +0000 (13:19 +0000)]
Merge "Change requestWait API according to request" into oc-dev

7 years agoRemove WebView-fallback code for handling the non-functional stub.
Gustav Sennton [Thu, 6 Apr 2017 15:18:02 +0000 (16:18 +0100)]
Remove WebView-fallback code for handling the non-functional stub.

We have already removed the non-functional WebView stub, so we can now
remove the logic ensuring that a primary device user could use any
valid WebView package even when a secondary user did not have any
WebView package to choose from (since all device users should always
have a valid package to use as WebView implementation).

Bug: 34730873
Test: run WebViewUpdateServiceTest tests.
Test: Create new user, disable Chrome for that user, ensure WebView
loads for that user and for the primary user.
Change-Id: Ia77cc2efd9e40a157fb5b68a988425ef15508033

7 years agoMerge "Add NETWORK_STACK permission" into oc-dev am: 087daa0da5
Lorenzo Colitti [Fri, 7 Apr 2017 12:56:16 +0000 (12:56 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev am: 087daa0da5
am: fe523c4917

Change-Id: I7313069148ed7cec4975b7039e71615a64169186

7 years agoMerge "Add NETWORK_STACK permission" into oc-dev
Lorenzo Colitti [Fri, 7 Apr 2017 12:48:26 +0000 (12:48 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev
am: 087daa0da5

Change-Id: I4eb02f88b6fecc92539516c859a07d61ffecd86e

7 years agoMerge "Add NETWORK_STACK permission" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 12:40:19 +0000 (12:40 +0000)]
Merge "Add NETWORK_STACK permission" into oc-dev

7 years agoRemoved unused variables in PerformBackupTask#finalizeBackup()
Artem Iglikov [Fri, 7 Apr 2017 12:11:01 +0000 (13:11 +0100)]
Removed unused variables in PerformBackupTask#finalizeBackup()

The unused variables got left behind after changes in ag/1841867.

This replicates ag/2077691 in RefactoredBackupManagerService.

Bug: 35994670
Test: it builds
Change-Id: Ic28719dafb83542d7e4c73cb48508d6792d10174

7 years agoMerge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: 59dd2ebfc1
Filip Pavlis [Fri, 7 Apr 2017 10:44:51 +0000 (10:44 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: 59dd2ebfc1
am: 3b3bf87165

Change-Id: I314d9bfa7d29eb506fa4bb7faedd7f8d506098b4

7 years agoMerge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Filip Pavlis [Fri, 7 Apr 2017 10:38:35 +0000 (10:38 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am: 59dd2ebfc1

Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb

7 years agoMerge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev

7 years agoRemoved unused variables in PerformBackupTask#finalizeBackup()
Michal Karpinski [Fri, 7 Apr 2017 09:47:02 +0000 (10:47 +0100)]
Removed unused variables in PerformBackupTask#finalizeBackup()

The unused variables got left behind after changes in ag/1841867.

Bug: 35994670
Test: it builds
Change-Id: Ic28719dafb83542d7e4c73cb48508d6792d10174

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am...
Jakub Pawlowski [Fri, 7 Apr 2017 07:22:30 +0000 (07:22 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am: 909f3b108f am: bc095f035d
am: 93cba9eeca

Change-Id: Id711563a93995c1c58bcf299d3cca3c3624557fc

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am...
Jakub Pawlowski [Fri, 7 Apr 2017 07:14:36 +0000 (07:14 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am: 909f3b108f
am: bc095f035d

Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975
Jakub Pawlowski [Fri, 7 Apr 2017 07:05:32 +0000 (07:05 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975
am: 909f3b108f

Change-Id: Iba1be10854f9f7c8fd1459150dfdc79ac8eac395

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values"
Jakub Pawlowski [Fri, 7 Apr 2017 06:57:30 +0000 (06:57 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
am: 7bf58d5975

Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values"
Treehugger Robot [Fri, 7 Apr 2017 06:44:48 +0000 (06:44 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"

7 years agoMerge "Do not make strong reference to Resources." into oc-dev am: 327c0b9f88
Bryce Lee [Fri, 7 Apr 2017 06:37:32 +0000 (06:37 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev am: 327c0b9f88
am: c1ed86ab10

Change-Id: Idd0c2d7be02d4de7318e805d639ad0d5cc016e44

7 years agoMerge "Do not make strong reference to Resources." into oc-dev
Bryce Lee [Fri, 7 Apr 2017 06:29:24 +0000 (06:29 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev
am: 327c0b9f88

Change-Id: I0e11d59f701d6effd5500909e4d27a649e22472a

7 years agoMerge "Do not make strong reference to Resources." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 06:20:56 +0000 (06:20 +0000)]
Merge "Do not make strong reference to Resources." into oc-dev

7 years agoExpose package_verifier_user_consent to Instant Apps
Chad Brubaker [Fri, 7 Apr 2017 05:57:18 +0000 (22:57 -0700)]
Expose package_verifier_user_consent to Instant Apps

Test: manual
Bug: 37119785
Change-Id: I0a6deb96f1267f3f80bcf017d898fcf365515353

7 years agoAdd NETWORK_STACK permission
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Add NETWORK_STACK permission

Add a new permission that only allows other system services to call
networking related methods.  This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.

Bug: 36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294
(cherry picked from commit fa84050a7e51e2a6643ea242b43f16cd6e3114dd)

7 years agoMerge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
Lorenzo Colitti [Fri, 7 Apr 2017 05:21:23 +0000 (05:21 +0000)]
Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
am: fa84050a7e

Change-Id: If1abfc3a7ee596e23257d0259bc5d0243f31e82b

7 years agoMerge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440
Lorenzo Colitti [Fri, 7 Apr 2017 05:13:29 +0000 (05:13 +0000)]
Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440
am: d6b2e7ac93

Change-Id: I116011c73f20bdd3c23d58c19fc083e2387979ab

7 years agoMerge "Add NETWORK_STACK permission" am: b23fabf3fd
Lorenzo Colitti [Fri, 7 Apr 2017 05:04:49 +0000 (05:04 +0000)]
Merge "Add NETWORK_STACK permission" am: b23fabf3fd
am: 09146fc440

Change-Id: If0ebaea53188d008ce1cf81ac4f3356c9943dad8

7 years agoMerge "Add NETWORK_STACK permission"
Lorenzo Colitti [Fri, 7 Apr 2017 05:00:15 +0000 (05:00 +0000)]
Merge "Add NETWORK_STACK permission"
am: b23fabf3fd

Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a

7 years agoMerge "Add NETWORK_STACK permission"
Lorenzo Colitti [Fri, 7 Apr 2017 04:51:13 +0000 (04:51 +0000)]
Merge "Add NETWORK_STACK permission"

7 years agoDo not make strong reference to Resources.
Bryce Lee [Thu, 6 Apr 2017 17:27:53 +0000 (10:27 -0700)]
Do not make strong reference to Resources.

This CL removes the strong reference added for mapping display ids
and Resources to Displays. Instead, the key pair is now the display
id and ResourcesKey, and the mapping is pruned when key is
invalidated.

Change-Id: I60d767b52de7bbf769f6761f5a3301dd7aff6ddf
Fixes: 36625868
Test: make -j32 cts; cts-tradefed; run cts --module CtsAppTestCases --test android.app.cts.DisplayTest#testRotation

7 years agoMerge "Use Context#startForegroundService in MTP provider"
TreeHugger Robot [Fri, 7 Apr 2017 04:18:20 +0000 (04:18 +0000)]
Merge "Use Context#startForegroundService in MTP provider"

7 years agoNetworkPolicyManagerService: use hasRule()
Hugo Benichi [Tue, 28 Mar 2017 08:17:13 +0000 (17:17 +0900)]
NetworkPolicyManagerService: use hasRule()

Change-Id: I74c62967b9565ec92f84ed19af14c46d4df14808
Test: no functional change.
Bug: 32069544