OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Handle devices without quota, speed up lookup." am: 36ba03a248
Jeff Sharkey [Tue, 17 Jan 2017 17:47:16 +0000 (17:47 +0000)]
Merge "Handle devices without quota, speed up lookup." am: 36ba03a248
am: 411ae16a91

Change-Id: Icb7deaa5e60880d783fc4c434bbd0e70ad2c188b

7 years agoMerge "Handle devices without quota, speed up lookup."
Jeff Sharkey [Tue, 17 Jan 2017 17:27:14 +0000 (17:27 +0000)]
Merge "Handle devices without quota, speed up lookup."
am: 36ba03a248

Change-Id: I38d4e01057e3cd65f4362056336294e8136df459

7 years agoMerge "Handle devices without quota, speed up lookup."
Jeff Sharkey [Tue, 17 Jan 2017 16:54:00 +0000 (16:54 +0000)]
Merge "Handle devices without quota, speed up lookup."

7 years agoMerge changes Ic746ea89,Iebaa8063 am: 950e3f5696
Jeff Sharkey [Tue, 17 Jan 2017 04:13:56 +0000 (04:13 +0000)]
Merge changes Ic746ea89,Iebaa8063 am: 950e3f5696
am: f1d87ca9b8

Change-Id: Icdbfc562c9aad5ed0253e04b215d88cb666c94c1

7 years agoWrap all installd operations in lock. am: 7a9059e8ed
Jeff Sharkey [Tue, 17 Jan 2017 04:13:46 +0000 (04:13 +0000)]
Wrap all installd operations in lock. am: 7a9059e8ed
am: b940bdae84

Change-Id: I494c59b015dac7dd301c1666ef95a9c28a00f7e3

7 years agoMask st_mode before comparing it. am: 24ef15bd00
Jeff Sharkey [Tue, 17 Jan 2017 04:13:37 +0000 (04:13 +0000)]
Mask st_mode before comparing it. am: 24ef15bd00
am: 0e636867b5

Change-Id: Ic8968f123759d36d49bf9bd65ec17e7f6024b888

7 years agoMerge changes Ic746ea89,Iebaa8063
Jeff Sharkey [Tue, 17 Jan 2017 04:08:16 +0000 (04:08 +0000)]
Merge changes Ic746ea89,Iebaa8063
am: 950e3f5696

Change-Id: I61d240c0345e7b0a5a5d499c003230396aa469ec

7 years agoWrap all installd operations in lock.
Jeff Sharkey [Tue, 17 Jan 2017 04:08:14 +0000 (04:08 +0000)]
Wrap all installd operations in lock.
am: 7a9059e8ed

Change-Id: Ide1ef93a041ee5ff683babb865e382d1cb7a7356

7 years agoMask st_mode before comparing it.
Jeff Sharkey [Tue, 17 Jan 2017 04:08:06 +0000 (04:08 +0000)]
Mask st_mode before comparing it.
am: 24ef15bd00

Change-Id: I2b9ec79a679428cb6018798110bf4c3aa2936ae0

7 years agoMerge changes Ic746ea89,Iebaa8063
Treehugger Robot [Tue, 17 Jan 2017 04:02:45 +0000 (04:02 +0000)]
Merge changes Ic746ea89,Iebaa8063

* changes:
  Wrap all installd operations in lock.
  Mask st_mode before comparing it.

7 years agoHandle devices without quota, speed up lookup.
Jeff Sharkey [Tue, 17 Jan 2017 03:57:45 +0000 (20:57 -0700)]
Handle devices without quota, speed up lookup.

Start tracking which block devices have quota support, and gracefully
clear FLAG_USE_QUOTA when no support is present.

Also build a cached map of mounted volumes that support quota, which
halves the average quota calculation speed from 0.70ms to 0.35ms,
since we're no longer parsing procfs every time.

Test: builds, boots, common operations work
Bug: 34249218
Change-Id: Ie791df7801b67495331f3eea256c018860c9b4f6

7 years agoWrap all installd operations in lock.
Jeff Sharkey [Tue, 17 Jan 2017 02:07:18 +0000 (19:07 -0700)]
Wrap all installd operations in lock.

Historically installd has a single lock up in the framework, but
we're starting to call in from multiple locations, so installd needs
to protect itself.

This specifically applies to any disk measurement requests, which
use the optimized fts(3) mode which uses chdir() internally.

Test: builds, boots, common operations work
Bug: 34330051
Change-Id: Ic746ea890ebcc7b2bf923404874b04dbc19d42ad

7 years agoMask st_mode before comparing it.
Jeff Sharkey [Fri, 13 Jan 2017 02:27:03 +0000 (19:27 -0700)]
Mask st_mode before comparing it.

Otherwise it will never match the requested mode_t.

Test: builds, boots, skips when matching
Bug: 34201111
Change-Id: Iebaa8063a72eb6eaf2e773c1d35204617d0f16b8

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros" am: 9a30f044ca
Mark Salyzyn [Thu, 12 Jan 2017 22:06:58 +0000 (22:06 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 9a30f044ca
am: 70a969c6fc

Change-Id: I5b2e4fa842edf56ab85c6bcb24997e537c02d5de

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros"
Mark Salyzyn [Thu, 12 Jan 2017 22:04:58 +0000 (22:04 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"
am: 9a30f044ca

Change-Id: Ibf35cc60eeb53bc421a2f886fa63b37ffa2083c1

7 years agoMerge "liblog: use log/log.h when utilizing ALOG macros"
Mark Salyzyn [Thu, 12 Jan 2017 21:59:57 +0000 (21:59 +0000)]
Merge "liblog: use log/log.h when utilizing ALOG macros"

7 years agoliblog: use log/log.h when utilizing ALOG macros
Mark Salyzyn [Thu, 12 Jan 2017 21:57:51 +0000 (13:57 -0800)]
liblog: use log/log.h when utilizing ALOG macros

Audit dropout because ALOG is behind MYLOG ...

Test: compile
Bug: 34250038
Change-Id: I009478157d2267e10f8c09a7faa4b8f7c7c4a1e7

7 years agoMerge "Don't print error if we can't talk to hwservicemanager." am: 53d36e4476
Martijn Coenen [Thu, 12 Jan 2017 21:27:25 +0000 (21:27 +0000)]
Merge "Don't print error if we can't talk to hwservicemanager." am: 53d36e4476
am: c144b7da38

Change-Id: Ib2b9c2e285bd0dddab59b4ee40599d9fed63fd49

7 years agoMerge "Don't print error if we can't talk to hwservicemanager."
Martijn Coenen [Thu, 12 Jan 2017 21:24:56 +0000 (21:24 +0000)]
Merge "Don't print error if we can't talk to hwservicemanager."
am: 53d36e4476

Change-Id: I3a524a89d8d6b022b4a825197e29b6a69687c8d9

7 years agoMerge "Don't print error if we can't talk to hwservicemanager."
Treehugger Robot [Thu, 12 Jan 2017 21:20:15 +0000 (21:20 +0000)]
Merge "Don't print error if we can't talk to hwservicemanager."

7 years agoDon't print error if we can't talk to hwservicemanager.
Martijn Coenen [Thu, 12 Jan 2017 16:16:31 +0000 (17:16 +0100)]
Don't print error if we can't talk to hwservicemanager.

This currently fails as a non-root user due to SEPolicy,
and is causing CTS test failures. Until we figure out
the policy on b/34242478, don't print an error to allow
the test to pass again.

Test: cts-tradefed run cts --module CtsAtraceHostTestCases --test
android.atrace.cts.AtraceHostTest#testSimpleRun

Bug: 33814619
Change-Id: Ie5578639028e7890284d71bbf1b753f5803ca4af

7 years agoMerge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22
Mark Salyzyn [Thu, 12 Jan 2017 15:48:18 +0000 (15:48 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22
am: 16a30c1ac8

Change-Id: I697418fbab0dbbd447d0dca2eda5b1545cc2522e

7 years agoMerge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
Mark Salyzyn [Thu, 12 Jan 2017 15:34:32 +0000 (15:34 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am: d655e61a22

Change-Id: I86d040528ab10e503e03f033f12d47a8142c3c6b

7 years agoMerge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
Mark Salyzyn [Thu, 12 Jan 2017 15:19:07 +0000 (15:19 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"

7 years agoReplace cutils/log.h and rationalize log/log.h and android/log.h
Mark Salyzyn [Thu, 29 Sep 2016 15:08:05 +0000 (08:08 -0700)]
Replace cutils/log.h and rationalize log/log.h and android/log.h

- cutils/log.h treat as deprecated and lead by example
- android/log.h to be used instead of log/log.h if possible
- add system includes that are assumed as side effects
- define LOG_TAG first

Test: compile
Bug: 31289077
Bug: 30465923
Change-Id: I8d99b24c333578c9b5aa9f2a01324bd0bba268dd

7 years agoMerge "Added test cases to dumpsys." am: 5cfc1c0546
Felipe Leme [Wed, 11 Jan 2017 19:04:25 +0000 (19:04 +0000)]
Merge "Added test cases to dumpsys." am: 5cfc1c0546
am: 74ee4a06a3

Change-Id: I5e536d12eef0ff8d41030f037f309f67c880b2a7

7 years agoMerge "Added test cases to dumpsys."
Felipe Leme [Wed, 11 Jan 2017 18:59:22 +0000 (18:59 +0000)]
Merge "Added test cases to dumpsys."
am: 5cfc1c0546

Change-Id: I87917d89160271a635ac1a42728fb643e1df99ae

7 years agoMerge "Added test cases to dumpsys."
Treehugger Robot [Wed, 11 Jan 2017 18:51:14 +0000 (18:51 +0000)]
Merge "Added test cases to dumpsys."

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 6c207a7d96
Richard Uhler [Wed, 11 Jan 2017 10:48:12 +0000 (10:48 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 6c207a7d96
am: 83c87d4985

Change-Id: I72c03782c82ff40cef7c520adc6d694b52289951

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Richard Uhler [Wed, 11 Jan 2017 10:37:44 +0000 (10:37 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
am: 6c207a7d96

Change-Id: I82f59649db71b255abdbafae8190f40974534f83

7 years agoMerge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."
Treehugger Robot [Wed, 11 Jan 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed."

7 years agoAdded test cases to dumpsys.
Felipe Leme [Wed, 3 Aug 2016 01:57:37 +0000 (18:57 -0700)]
Added test cases to dumpsys.

BUG: 28980245
BUG: 33382892

Test: dumpsys_test passes

Change-Id: Ief6c21022abc74022256431351fd6eef789faf39
(cherry picked from commit b6e244914deaffcdeea02deebf7c0da2643f601c)

7 years agoMerge "Methods to calculate user and external disk usage." am: 4d9746d7a3
Jeff Sharkey [Tue, 10 Jan 2017 04:43:03 +0000 (04:43 +0000)]
Merge "Methods to calculate user and external disk usage." am: 4d9746d7a3
am: 15e80e0436

Change-Id: I63799087ee8b62b68da1f39ee2495b54481bd866

7 years agoMerge "Methods to calculate user and external disk usage."
Jeff Sharkey [Tue, 10 Jan 2017 04:38:23 +0000 (04:38 +0000)]
Merge "Methods to calculate user and external disk usage."
am: 4d9746d7a3

Change-Id: I7229c883efc6078b4fe3aa8231912eda1073ae48

7 years agoMerge "Methods to calculate user and external disk usage."
Jeff Sharkey [Tue, 10 Jan 2017 04:30:46 +0000 (04:30 +0000)]
Merge "Methods to calculate user and external disk usage."

7 years agoMethods to calculate user and external disk usage.
Jeff Sharkey [Sat, 7 Jan 2017 16:19:35 +0000 (09:19 -0700)]
Methods to calculate user and external disk usage.

Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user.  Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.

Add script to generate optimized file extension matcher logic.

Start measuring internal and external storage space separately; new
GIDs are coming in a future CL.  Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.

Test: builds, boots, stats are consistent
Bug: 2794881732206268
Change-Id: Icb9843ac5159e0e5f1503d9b64e0bcae407e1a5d

7 years agoMerge "Surface: Use async lock/unlock in copyBlt" am: b73de86f13
Jesse Hall [Mon, 9 Jan 2017 05:20:03 +0000 (05:20 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt" am: b73de86f13
am: e29dda829d

Change-Id: I753acee7ab8f0c0ca62a5606ae1b5c44e2314fd3

7 years agoMerge "Surface: Use async lock/unlock in copyBlt"
Jesse Hall [Mon, 9 Jan 2017 05:15:04 +0000 (05:15 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt"
am: b73de86f13

Change-Id: I5312414d1e66cc0dbd3b346f14c14eb1ff90e6da

7 years agoMerge "Surface: Use async lock/unlock in copyBlt"
Jesse Hall [Mon, 9 Jan 2017 05:07:29 +0000 (05:07 +0000)]
Merge "Surface: Use async lock/unlock in copyBlt"

7 years agoMerge "egl: Add NULL check for num_config parameter" am: 64990fc0b9
Jesse Hall [Sat, 7 Jan 2017 23:53:50 +0000 (23:53 +0000)]
Merge "egl: Add NULL check for num_config parameter" am: 64990fc0b9
am: ccaf6bf34a

Change-Id: Ifada0489e548bbbfa7378b408a1268b7a7b4da03

7 years agoMerge "egl: Add NULL check for num_config parameter"
Jesse Hall [Sat, 7 Jan 2017 23:49:20 +0000 (23:49 +0000)]
Merge "egl: Add NULL check for num_config parameter"
am: 64990fc0b9

Change-Id: I1000300a6ca1a5ee9013f68aacd8541cdfac48b1

7 years agoMerge "egl: Add NULL check for num_config parameter"
Jesse Hall [Sat, 7 Jan 2017 23:44:22 +0000 (23:44 +0000)]
Merge "egl: Add NULL check for num_config parameter"

7 years agoMerge "Unversion NDK stub libraries." am: 3944ec426b
Dan Albert [Fri, 6 Jan 2017 21:10:49 +0000 (21:10 +0000)]
Merge "Unversion NDK stub libraries." am: 3944ec426b
am: ce80f3f4b0

Change-Id: I3871fc9393cdabe0eebae30f87d2d2555ddf6dfc

7 years agoMerge "Unversion NDK stub libraries."
Dan Albert [Fri, 6 Jan 2017 21:03:17 +0000 (21:03 +0000)]
Merge "Unversion NDK stub libraries."
am: 3944ec426b

Change-Id: I3266580d6f41b32ec8775e0bb73c66303ed5fa62

7 years agoMerge "Unversion NDK stub libraries."
Treehugger Robot [Fri, 6 Jan 2017 20:53:07 +0000 (20:53 +0000)]
Merge "Unversion NDK stub libraries."

7 years agoUnversion NDK stub libraries.
Dan Albert [Thu, 5 Jan 2017 23:58:50 +0000 (15:58 -0800)]
Unversion NDK stub libraries.

The system versions of these libraries aren't versioned yet.

Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I73e4ebcac151c4039df6261aa6674accb0204706

7 years agoMerge "Add android/log.h to Rect.h" am: a422103c90
Steve Paik [Fri, 6 Jan 2017 02:17:58 +0000 (02:17 +0000)]
Merge "Add android/log.h to Rect.h" am: a422103c90
am: 20b8c55a5e

Change-Id: I48190e464c2667edaf8cf71a27581c8bd929c1be

7 years agoMerge "Add android/log.h to Rect.h"
Steve Paik [Fri, 6 Jan 2017 02:14:28 +0000 (02:14 +0000)]
Merge "Add android/log.h to Rect.h"
am: a422103c90

Change-Id: I47eecbef3964168a075554b39135286254854472

7 years agoMerge "Add android/log.h to Rect.h"
Treehugger Robot [Fri, 6 Jan 2017 02:08:15 +0000 (02:08 +0000)]
Merge "Add android/log.h to Rect.h"

7 years agoAdd android/log.h to Rect.h
Steve Paik [Thu, 5 Jan 2017 17:09:56 +0000 (09:09 -0800)]
Add android/log.h to Rect.h

Rect.h uses definitions from log.h.

Test:  Build succeeds when C file doesn't include log.h.
Change-Id: Ia85372ca61edafadea92165121dc6fbd1546674b

7 years agoCleanup code given PATCHOAT_FOR_RELOCATION has been removed.
Richard Uhler [Thu, 8 Dec 2016 10:46:35 +0000 (10:46 +0000)]
Cleanup code given PATCHOAT_FOR_RELOCATION has been removed.

Test: make, device boots.
Bug: 33192586
Change-Id: Ic3937708a7dfcd16f02cf68fc20674ec457d60b7

7 years agoMerge "Pass the same fd when compiling due to boot image update." am: 4f8c1fd2ea
Nicolas Geoffray [Thu, 5 Jan 2017 15:04:05 +0000 (15:04 +0000)]
Merge "Pass the same fd when compiling due to boot image update." am: 4f8c1fd2ea
am: dd4268dc5e

Change-Id: I996ab33bafcba4480a99d81496864d5157bda316

7 years agoMerge "Pass the same fd when compiling due to boot image update."
Nicolas Geoffray [Thu, 5 Jan 2017 15:01:32 +0000 (15:01 +0000)]
Merge "Pass the same fd when compiling due to boot image update."
am: 4f8c1fd2ea

Change-Id: Ifbc81ad7ffebdcb2eb40e279c558899ec1dce505

7 years agoMerge "Pass the same fd when compiling due to boot image update."
Treehugger Robot [Thu, 5 Jan 2017 14:56:01 +0000 (14:56 +0000)]
Merge "Pass the same fd when compiling due to boot image update."

7 years agoPass the same fd when compiling due to boot image update.
Nicolas Geoffray [Tue, 20 Dec 2016 15:03:56 +0000 (15:03 +0000)]
Pass the same fd when compiling due to boot image update.

Test: device boots, apps get installed, OTA uses same vdex.
Change-Id: I913062630640f31a18d23b2f62afd74986322e6a

7 years agoSurface: Use async lock/unlock in copyBlt
Francis Hart [Fri, 9 Jan 2015 09:10:54 +0000 (11:10 +0200)]
Surface: Use async lock/unlock in copyBlt

The Surface::lock() function now uses the asynchronous versions of
gralloc lock/unlock when copying the previously drawn content to the
backbuffer. This allows for optimisations in the gralloc module
implementation and so can improve performance and avoid CPU waits.

Change-Id: I57193f327db2ff0422e1b58b3484f613201d994c

7 years agoMerge "Callback elision for HIDL interfaces." am: b7ee96a666
Martijn Coenen [Thu, 5 Jan 2017 09:52:45 +0000 (09:52 +0000)]
Merge "Callback elision for HIDL interfaces." am: b7ee96a666
am: d390a8291a

Change-Id: I6977094aa5a97d82b51c18f605e258046c488c7e

7 years agoMerge "Callback elision for HIDL interfaces."
Martijn Coenen [Thu, 5 Jan 2017 09:46:55 +0000 (09:46 +0000)]
Merge "Callback elision for HIDL interfaces."
am: b7ee96a666

Change-Id: I2d71b02f11d16c95830adbca36f77345ba58cafa

7 years agoMerge "Callback elision for HIDL interfaces."
Martijn Coenen [Thu, 5 Jan 2017 09:40:55 +0000 (09:40 +0000)]
Merge "Callback elision for HIDL interfaces."

7 years agoCallback elision for HIDL interfaces.
Martijn Coenen [Mon, 2 Jan 2017 14:17:11 +0000 (15:17 +0100)]
Callback elision for HIDL interfaces.

Test: mma
Bug: 31380743
Change-Id: I33080b61d6233b63106b2602a628bfcdaa878a90

7 years agoMerge "Surface: Ensure synchronisation of copyBlt" am: 88f77814a1
Francis Hart [Wed, 4 Jan 2017 20:41:52 +0000 (20:41 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt" am: 88f77814a1
am: 5a2dcde971

Change-Id: Ifb17a3d79f367bf22e01746209453f8b36bb35b5

7 years agoMerge "Surface: Ensure synchronisation of copyBlt"
Francis Hart [Wed, 4 Jan 2017 20:38:52 +0000 (20:38 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt"
am: 88f77814a1

Change-Id: If8fe2dde08a1a850029e1d9ca6a7ae965f2aa8ab

7 years agoMerge "Surface: Ensure synchronisation of copyBlt"
Treehugger Robot [Wed, 4 Jan 2017 20:33:09 +0000 (20:33 +0000)]
Merge "Surface: Ensure synchronisation of copyBlt"

7 years agoMerge "Mark libGLESv3 as unversioned until android-24." am: a09d0363fd
Dan Albert [Wed, 4 Jan 2017 19:08:56 +0000 (19:08 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24." am: a09d0363fd
am: 3ee6686fdd

Change-Id: I6ed0b6e51ddb3cd8c20e4a3d771ddff946c0b6ff

7 years agoMerge "Mark libGLESv3 as unversioned until android-24."
Dan Albert [Wed, 4 Jan 2017 19:06:28 +0000 (19:06 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24."
am: a09d0363fd

Change-Id: Ic902107fc0f9f78fa9ab124c99cbb5f976ebbe61

7 years agoMerge "Mark libGLESv3 as unversioned until android-24."
Treehugger Robot [Wed, 4 Jan 2017 19:00:36 +0000 (19:00 +0000)]
Merge "Mark libGLESv3 as unversioned until android-24."

7 years agoMerge "Reference profiles use shared GID for user 0." am: 226f77d87a
Jeff Sharkey [Tue, 3 Jan 2017 23:44:06 +0000 (23:44 +0000)]
Merge "Reference profiles use shared GID for user 0." am: 226f77d87a
am: ac437f476f

Change-Id: I937eb89caebc9a750adc4529f4a3620f8840cccf

7 years agoMerge "Reference profiles use shared GID for user 0."
Jeff Sharkey [Tue, 3 Jan 2017 23:41:34 +0000 (23:41 +0000)]
Merge "Reference profiles use shared GID for user 0."
am: 226f77d87a

Change-Id: I3c4d10f9483f99f3db4b2b1ff53ab62cd0b567db

7 years agoMerge "Reference profiles use shared GID for user 0."
Jeff Sharkey [Tue, 3 Jan 2017 23:37:00 +0000 (23:37 +0000)]
Merge "Reference profiles use shared GID for user 0."

7 years agoMark libGLESv3 as unversioned until android-24.
Dan Albert [Tue, 3 Jan 2017 23:18:48 +0000 (15:18 -0800)]
Mark libGLESv3 as unversioned until android-24.

Test: readelf on android-23 and android-24 outputs to check version
      information.
Bug: https://github.com/android-ndk/ndk/issues/265

Change-Id: I4a9b50b015567c64b75f09e8414682d314a86bc4

7 years agoReference profiles use shared GID for user 0.
Jeff Sharkey [Tue, 3 Jan 2017 21:33:50 +0000 (14:33 -0700)]
Reference profiles use shared GID for user 0.

Test: builds, boots
Bug: 33977235
Change-Id: I4de3852b3f230a6dc874a630e3c1b9fff2d83169

7 years agoMerge "Offer to measure disk stats using quotas." am: 8aed997c14
Jeff Sharkey [Tue, 3 Jan 2017 19:31:46 +0000 (19:31 +0000)]
Merge "Offer to measure disk stats using quotas." am: 8aed997c14
am: 5fcfd07918

Change-Id: I5aaeadb2167ed5b4e4bcfc2ddbd86a05a62e30d1

7 years agoMerge "Offer to measure disk stats using quotas."
Jeff Sharkey [Tue, 3 Jan 2017 19:24:09 +0000 (19:24 +0000)]
Merge "Offer to measure disk stats using quotas."
am: 8aed997c14

Change-Id: I17e1355805fa2c439331b0a9814ce5160e0bd168

7 years agoMerge "Offer to measure disk stats using quotas."
Jeff Sharkey [Tue, 3 Jan 2017 19:08:07 +0000 (19:08 +0000)]
Merge "Offer to measure disk stats using quotas."

7 years agoOffer to measure disk stats using quotas.
Jeff Sharkey [Tue, 13 Dec 2016 00:32:56 +0000 (17:32 -0700)]
Offer to measure disk stats using quotas.

Now we're getting somewhere!  This CL starts using quotactl() to read
UID/GID quota statistics when called with FLAG_USE_QUOTA, otherwise
it continues using the old heavy-weight traversal for calculation.

We now set the recently defined per-app GID used for identifying
cached data, and we use the sticky GID bit on cache directories to
ensure that newly created data inherits the GID for tracking
purposes.  For any existing apps during an upgrade, an initial
bootstrapping case will recursively set this new GID.

This change also shuffles around a bunch of the tedious manual
accounting logic so that we exactly match the new quota statistics.

Test: builds, boots, quota stats match manual stats
Bug: 27948817
Change-Id: I8512c3193ce698f197a3f446e625d6a1c74e7649

7 years agogralloc1: Acquire mutex early in release
Ajit Kumar [Thu, 29 Dec 2016 21:56:44 +0000 (21:56 +0000)]
gralloc1: Acquire mutex early in release
am: 56ec3afb84

Change-Id: Iffcf6f2f95e9b70797080ceb6267679ec2e7e1a3

7 years agogralloc1: Acquire mutex early in release
Ajit Kumar [Fri, 25 Nov 2016 06:38:53 +0000 (12:08 +0530)]
gralloc1: Acquire mutex early in release

Due race condition between release and retain calls, retain return stale handle.
Which results in crash in SurfaceFlinger.
Fix crash by acquiring mutex early in release function.

Bug: 32384569
Change-Id: I9130f5864a53ef208dc1ad8ecf698f1847548285

7 years agoMerge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6
Mark Salyzyn [Wed, 28 Dec 2016 17:04:37 +0000 (17:04 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6
am: 7e92307cd8

Change-Id: I1523bfc0794fe8463fb6134ae8d8c5902947de8b

7 years agoMerge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
Mark Salyzyn [Wed, 28 Dec 2016 16:58:07 +0000 (16:58 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am: 1efda0b1d6

Change-Id: I263fa3a582bbff546f1281205b539258ee5dab49

7 years agoMerge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
Mark Salyzyn [Wed, 28 Dec 2016 16:48:57 +0000 (16:48 +0000)]
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"

7 years agoReplace cutils/log.h and rationalize log/log.h and android/log.h
Mark Salyzyn [Thu, 29 Sep 2016 15:08:05 +0000 (08:08 -0700)]
Replace cutils/log.h and rationalize log/log.h and android/log.h

- cutils/log.h treat as deprecated and lead by example
- android/log.h to be used instead of log/log.h if required
- add system includes that are assumed as side effects of log.h
- modules that use SLOG should use SLOG for all logging (installd)
- define LOG_TAG first
- remove logging infrastructure if not used

Test: build
Bug: 31289077
Change-Id: Iea147a0104c7ab7f12451304131d6500f42141e7

7 years agoMerge "Update for hiding Status from Return<T> object." am: c47aa53c84
Yifan Hong [Thu, 22 Dec 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Update for hiding Status from Return<T> object." am: c47aa53c84
am: e6d3ac9834

Change-Id: Ied0f1916b10b4f2edaa713716284acef1f5e3721

7 years agoMerge "Update for hiding Status from Return<T> object."
Yifan Hong [Thu, 22 Dec 2016 18:16:15 +0000 (18:16 +0000)]
Merge "Update for hiding Status from Return<T> object."
am: c47aa53c84

Change-Id: If4e92201b4f3a21925c9a2644fa8fa76d0ce7d18

7 years agoMerge "Update for hiding Status from Return<T> object."
Yifan Hong [Thu, 22 Dec 2016 18:04:15 +0000 (18:04 +0000)]
Merge "Update for hiding Status from Return<T> object."

7 years agoMerge "Only log restorecon changes for existing dirs." am: ee080ea229
Jeff Sharkey [Wed, 21 Dec 2016 19:03:48 +0000 (19:03 +0000)]
Merge "Only log restorecon changes for existing dirs." am: ee080ea229
am: ed8915cc2c

Change-Id: I3895295399a51b93ad5dea76d8d346591d6ca178

7 years agoMerge "Only log restorecon changes for existing dirs."
Jeff Sharkey [Wed, 21 Dec 2016 18:58:21 +0000 (18:58 +0000)]
Merge "Only log restorecon changes for existing dirs."
am: ee080ea229

Change-Id: Iac6ca0bdbd39efc2258efd354dfd054f6a6d026e

7 years agoUpdate for hiding Status from Return<T> object.
Yifan Hong [Wed, 21 Dec 2016 18:47:56 +0000 (10:47 -0800)]
Update for hiding Status from Return<T> object.

Test: compiles

Change-Id: Ie32514f34efaa1188f34f662b194b60d83c20bf0

7 years agoMerge "Only log restorecon changes for existing dirs."
Jeff Sharkey [Wed, 21 Dec 2016 18:46:27 +0000 (18:46 +0000)]
Merge "Only log restorecon changes for existing dirs."

7 years agoOnly log restorecon changes for existing dirs.
Jeff Sharkey [Wed, 21 Dec 2016 16:33:55 +0000 (09:33 -0700)]
Only log restorecon changes for existing dirs.

If we just created an app private data directory, we're always going
to be relabeling it, so don't log in that case.  Continue logging if
something caused us to relabel an existing app data directory.

Test: builds, boots, only logs for existing dirs
Bug: 31958779
Change-Id: Id03f7c18aed191a4c7fb9dcf9380136c93798a4b

7 years agoMerge "Remove ~1/3 of the installd calls at boot." am: ed04f3c7e5
Jeff Sharkey [Tue, 20 Dec 2016 01:17:42 +0000 (01:17 +0000)]
Merge "Remove ~1/3 of the installd calls at boot." am: ed04f3c7e5
am: 3f79c64976

Change-Id: I20e68b8a24f2242160110df51d673d18a127d64e

7 years agoMerge "Remove ~1/3 of the installd calls at boot."
Jeff Sharkey [Tue, 20 Dec 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
am: ed04f3c7e5

Change-Id: Id68b901ea2c12815df1d4c6e83e789101663870c

7 years agoMerge "Remove ~1/3 of the installd calls at boot."
Treehugger Robot [Tue, 20 Dec 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."

7 years agoRemove ~1/3 of the installd calls at boot.
Jeff Sharkey [Mon, 19 Dec 2016 23:39:18 +0000 (16:39 -0700)]
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: I68485e4b9b49e9da7b3ac7c66f50c6abc750b7e3

7 years agoMerge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function...
Peng Xu [Sat, 17 Dec 2016 00:24:25 +0000 (00:24 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function" am: 8d24d0022b
am: 36e86c3772

Change-Id: Ic55880154809cdd8fb338011ad987841f9d09443

7 years agoMerge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"
Peng Xu [Sat, 17 Dec 2016 00:15:04 +0000 (00:15 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"
am: 8d24d0022b

Change-Id: Ibd1faaf9c8a881a4fddcfa19e99357bb7ad13f0a

7 years agoMerge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"
Peng Xu [Sat, 17 Dec 2016 00:02:02 +0000 (00:02 +0000)]
Merge "Sensor: Add more comments for ASensorEventQueue_registerSensor() function"

7 years agoMerge "Handle invalid shared GIDs." am: 788bdeae78
Jeff Sharkey [Thu, 15 Dec 2016 23:21:49 +0000 (23:21 +0000)]
Merge "Handle invalid shared GIDs." am: 788bdeae78
am: 477601a9ff

Change-Id: Id21818687508092e41a970b9cd18ddbe15b7d740

7 years agoMerge "Handle invalid shared GIDs."
Jeff Sharkey [Thu, 15 Dec 2016 22:07:13 +0000 (22:07 +0000)]
Merge "Handle invalid shared GIDs."
am: 788bdeae78

Change-Id: I48c3d8e584a30ed994920f57570344d7736ab183

7 years agoMerge "Handle invalid shared GIDs."
Jeff Sharkey [Thu, 15 Dec 2016 21:59:08 +0000 (21:59 +0000)]
Merge "Handle invalid shared GIDs."

7 years agoHandle invalid shared GIDs.
Jeff Sharkey [Thu, 15 Dec 2016 21:50:11 +0000 (14:50 -0700)]
Handle invalid shared GIDs.

Shared GIDs are only available inside a range from 50000-59999, so
system UIDs (outside the normal app range) don't have a valid GID to
use.  The best we can do is skip the profile setup in those cases.

Test: builds
Bug: 27948817
Change-Id: I8c38a0e3631eafd07e96da3e37e641b3cce195a6