OSDN Git Service

android-x86/frameworks-base.git
7 years agomerge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Sun, 12 Feb 2017 08:10:02 +0000 (00:10 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev

7 years agoUpdate the exception description for start(). am: ac06177a13
Mark Goldstein [Sat, 11 Feb 2017 01:34:35 +0000 (01:34 +0000)]
Update the exception description for start(). am: ac06177a13
am: 8b137cc06b

Change-Id: Id448ab164e1fd0d3f5977c30c5395bcb6e87f90f

7 years agoUpdate the exception description for start().
Mark Goldstein [Sat, 11 Feb 2017 01:29:27 +0000 (01:29 +0000)]
Update the exception description for start().
am: ac06177a13

Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199

7 years agoUpdate the exception description for start().
Mark Goldstein [Fri, 10 Feb 2017 17:54:08 +0000 (09:54 -0800)]
Update the exception description for start().

Bug: 31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d

7 years agoZygote: Restore GL preload
Jesse Hall [Thu, 9 Feb 2017 22:43:14 +0000 (14:43 -0800)]
Zygote: Restore GL preload

Preloading GLES drivers in Zygote was removed previously since it is
incompatible with updatable drivers. That caused some app startup
latency and system memory use regressions. This change re-adds GLES
driver preloading, but only on devices that don't support driver
updates.

Bug: 34611670
Bug: 35052548
Test: boot angler, systrace of Calculator app startup
Change-Id: Ibdc6b3c0ba4473574722641d4bfad4b375f908a3
(cherry picked from commit ba0370eef3d17baa70d43723e96eb135c8e4ed58)

7 years agoMerge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
TreeHugger Robot [Fri, 10 Feb 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev

7 years agoMerge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293...
Rubin Xu [Fri, 10 Feb 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9
am: f85a20702a

Change-Id: If9e569ba66dc9e5876fab5ffd2a6c9b0a9fb923b

7 years agoMerge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293...
Rubin Xu [Fri, 10 Feb 2017 12:24:43 +0000 (12:24 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce
am: 72074e3ab9

Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04

7 years agoMerge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293
Rubin Xu [Fri, 10 Feb 2017 12:20:18 +0000 (12:20 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293
am: 824c8284ce

Change-Id: If4dfa2d7af980c91ec3d3f8faa7e7f4a39350c82

7 years agoMerge "Fix uri permission grant on remote bug report uri" into nyc-dev
Rubin Xu [Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
am: 42f2e80293

Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4

7 years agoMerge "Fix uri permission grant on remote bug report uri" into nyc-dev
TreeHugger Robot [Fri, 10 Feb 2017 12:10:58 +0000 (12:10 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev

7 years agoMerge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev
Selim Cinek [Fri, 10 Feb 2017 00:06:39 +0000 (00:06 +0000)]
Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.

A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
(cherry picked from commit 3eddf406755d6ab18acb46f9550c997ca4bb1970)

7 years agoFixed an issue where the emergency affordance didn't show
Selim Cinek [Wed, 8 Feb 2017 20:51:59 +0000 (12:51 -0800)]
Fixed an issue where the emergency affordance didn't show

The state wheather the sim affordance was needed before was
loaded but not saved locally if it didn't change, so any
further requests would have the default values if it stayed
true.

Test: add india sim, go into airplane mode, reboot, see emergency
button
Fixes: 34370542
Change-Id: I9da1f5ca8025df6c2618ab467e937cf5cf9aa132

7 years agoMerge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLo...
Greg Plesur [Thu, 9 Feb 2017 19:50:01 +0000 (19:50 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev
am: 5659b15a94

Change-Id: I4bb6bc892ea172b7bda1ccc5dd840de128908223

7 years agoAllow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
Greg Plesur [Thu, 9 Feb 2017 19:49:58 +0000 (19:49 +0000)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
am: 735b4dc0af

Change-Id: I5c8ca6d0a63af83cde91c17d10a634469c726442

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours...
Jeff Sharkey [Thu, 9 Feb 2017 19:45:34 +0000 (19:45 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12  -s ours am: b30169299b  -s ours
am: 31c7fa003d  -s ours

Change-Id: Ia19b5ec4e496b8c87461081a23aef6335fe45725

7 years agoMerge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLo...
Greg Plesur [Thu, 9 Feb 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked()." into cw-f-dev

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours
Jeff Sharkey [Thu, 9 Feb 2017 19:41:31 +0000 (19:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12  -s ours
am: b30169299b  -s ours

Change-Id: Iac47439b256367683e44d09042996ad060c3c43d

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Thu, 9 Feb 2017 19:37:23 +0000 (19:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: 78f2e38a12  -s ours

Change-Id: I51385a2b84bfc4e0fa387ceb644be523ca55ced3

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.

A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours...
Jeff Sharkey [Thu, 9 Feb 2017 17:41:44 +0000 (17:41 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4  -s ours am: be0dab477e am: 47656a3cbd
am: 99755cb458

Change-Id: I0380911f9607eed5f10a6c497f273ccbc67b3721

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours...
Jeff Sharkey [Thu, 9 Feb 2017 17:37:47 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4  -s ours am: be0dab477e
am: 47656a3cbd

Change-Id: I5835528fe288b1ee117265d37e39fcfd0bbb301b

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675
Jeff Sharkey [Thu, 9 Feb 2017 17:37:44 +0000 (17:37 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3eddf40675
am: 14b308de91

Change-Id: I428dcaa5e44364d30a51392c224ad68a6e455e2b

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4 -s ours
Jeff Sharkey [Thu, 9 Feb 2017 17:33:51 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: a78841ebd4  -s ours
am: be0dab477e

Change-Id: I28971e3707b67f7f3e4a566fd4f8e891d7e8823b

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Thu, 9 Feb 2017 17:33:43 +0000 (17:33 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: 3eddf40675

Change-Id: Ied7f446ac2e539654b9f7d5e1ab7cce8aec7390e

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Thu, 9 Feb 2017 17:28:44 +0000 (17:28 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am: a78841ebd4  -s ours

Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab

7 years agoAllow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().
Greg Plesur [Thu, 9 Feb 2017 16:06:24 +0000 (11:06 -0500)]
Allow any device with a device_owner to execute setDeviceOwnerSystemPropertyLocked().

BUG: 34824902
Change-Id: I95fbe0a352c48a3fff5af57b91325901a16d3d89

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 9 Feb 2017 11:28:22 +0000 (11:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 9 Feb 2017 09:57:11 +0000 (01:57 -0800)]
Import translations. DO NOT MERGE

Change-Id: I751a4937bc2753f50aaf1177868c9199e8d201ec
Auto-generated-cl: translation import

7 years agomerge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Thu, 9 Feb 2017 08:09:41 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev

7 years agoMerge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemProperty...
Greg Plesur [Wed, 8 Feb 2017 23:44:17 +0000 (23:44 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev
am: 8a2ea2cf83

Change-Id: I9c2c3d822023277aada4685a11f4b272585550ea

7 years agoDon't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
Greg Plesur [Wed, 8 Feb 2017 23:44:13 +0000 (23:44 +0000)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
am: c7b18342ea

Change-Id: I692fee4165de9a274d8eb8f0deaf49762974bb22

7 years agoMerge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemProperty...
TreeHugger Robot [Wed, 8 Feb 2017 23:36:06 +0000 (23:36 +0000)]
Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev

7 years agoMerge "Add additional logging for temperature readings." into nyc-mr2-dev
TreeHugger Robot [Wed, 8 Feb 2017 23:31:13 +0000 (23:31 +0000)]
Merge "Add additional logging for temperature readings." into nyc-mr2-dev

7 years agoDon't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
Greg Plesur [Wed, 8 Feb 2017 19:57:34 +0000 (14:57 -0500)]
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()

BUG: 34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0

7 years agoDO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
Erik Wolsheimer [Wed, 8 Feb 2017 19:46:49 +0000 (19:46 +0000)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
am: 84aa5a864f

Change-Id: Ibcbaba3bb406e07f97561bc87916f6891fc25b74

7 years agoFix uri permission grant on remote bug report uri
Rubin Xu [Mon, 6 Feb 2017 17:18:50 +0000 (17:18 +0000)]
Fix uri permission grant on remote bug report uri

System server is no longer allowed to grant uri permission directly. As a result
we use grantUriPermissionFromIntent() to grant permission from the shell UID,
who is the owner of the bug report content.

Also fix a security bug where the broadcast to notify user consent of remote
bug report mismatches the <protected-broadcast> definition, causing it to be
sendable by anyone.

Bug: 34159108
Test: manual - Install TestDPC and request bugreport, try accept and decline
      once the report is ready (Bullhead).

Merged-In: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Change-Id: I66e3f2a16d4547549f09d3c96d52aed2330caedf

7 years ago2D Recents: Slightly darken header to differentiate from thumbnail
Manu Cornet [Tue, 7 Feb 2017 01:47:42 +0000 (17:47 -0800)]
2D Recents: Slightly darken header to differentiate from thumbnail

Bug: 34771148
Test: Locally on sw600dp device, sent screenshot to UX to confirm
Change-Id: I74282c6ed81d3b48d554f9acf55d4fafca2c73f4

7 years agomerge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Wed, 8 Feb 2017 08:09:27 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev

7 years agoDO NOT MERGE Guard against null entries in process list during updateOomAdjLocked
Erik Wolsheimer [Wed, 8 Feb 2017 04:54:20 +0000 (20:54 -0800)]
DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked

BUG: 34312358
Change-Id: I9b303d443b082bba8b440e6e1ef68b050a970386

7 years agoMerge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev
Shreyas Basarge [Wed, 8 Feb 2017 00:49:55 +0000 (00:49 +0000)]
Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev

7 years agoMerge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev
TreeHugger Robot [Wed, 8 Feb 2017 00:00:22 +0000 (00:00 +0000)]
Merge "2D Recents: Fix the thumbnail radius." into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 17:21:06 +0000 (17:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agomerge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Tue, 7 Feb 2017 08:09:32 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:30:04 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 04:21:41 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.

A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.

A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself.  Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.

Test: builds, boots, send/recv MMS works in primary/secondary users
Bug: 33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9afb9ecf42f87fffd3e65477decb55e)

7 years agoMerge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
Charles He [Tue, 7 Feb 2017 01:15:20 +0000 (01:15 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev

7 years agoFingerprint: get auth id for non-current user.
Charles He [Fri, 27 Jan 2017 16:14:52 +0000 (16:14 +0000)]
Fingerprint: get auth id for non-current user.

Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.

Bug: 33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Feb 2017 00:42:58 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id83eff0bcff1cfadadc4e91ce2d9d58a3f31194e
Auto-generated-cl: translation import

7 years agoMerge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
TreeHugger Robot [Mon, 6 Feb 2017 23:21:01 +0000 (23:21 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
Aaron Whyte [Mon, 6 Feb 2017 23:00:39 +0000 (23:00 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am: 50fa8ad424

Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183

7 years agoPrevent division-by-zero error when calculating battery capacity.
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:00:35 +0000 (23:00 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am: 415f8b32e8

Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Feb 2017 22:55:04 +0000 (14:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: If399bc861f4e82ce0e7e285927ff1cd90b15ced1
Auto-generated-cl: translation import

7 years agoMerge "Prevent division-by-zero error when calculating battery capacity." into cw...
Aaron Whyte [Mon, 6 Feb 2017 22:49:32 +0000 (22:49 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 6 Feb 2017 22:45:47 +0000 (14:45 -0800)]
Import translations. DO NOT MERGE

Change-Id: I49242a808f0bf41ff7229c82e198bfb05ea87a2e
Auto-generated-cl: translation import

7 years agoMerge "2D Recents: use correct layout logic for drawing transition headers" into...
Manu Cornet [Mon, 6 Feb 2017 22:38:31 +0000 (22:38 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev

7 years agoMerge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba
Ricardo Loo [Mon, 6 Feb 2017 20:50:48 +0000 (20:50 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev am: 19dae584ba
am: b06c3ed79e

Change-Id: I97f1b4559b0c8d4eb3709a455e54157fe3a40426

7 years agodocs: Update gluUnProject parameter description. am: 232c4900ac
Ricardo Loo [Mon, 6 Feb 2017 20:49:49 +0000 (20:49 +0000)]
docs: Update gluUnProject parameter description. am: 232c4900ac
am: cb6a5fc0f3

Change-Id: Ied7be460f12d29dd1ce77be724c11b78e2179293

7 years agoMerge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
Ricardo Loo [Mon, 6 Feb 2017 20:45:27 +0000 (20:45 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
am: 19dae584ba

Change-Id: I401682a35913ed936d124f7265e3e9338335ccee

7 years agodocs: Update gluUnProject parameter description.
Ricardo Loo [Mon, 6 Feb 2017 20:45:23 +0000 (20:45 +0000)]
docs: Update gluUnProject parameter description.
am: 232c4900ac

Change-Id: I087f08225229483798997096be428ef89f61d0bb

7 years agoMerge "docs: Update gluUnProject parameter description." into nyc-mr1-dev
Ricardo Loo [Mon, 6 Feb 2017 20:37:43 +0000 (20:37 +0000)]
Merge "docs: Update gluUnProject parameter description." into nyc-mr1-dev

7 years agoFix requiresCharging false value ignored issue
Shreyas Basarge [Mon, 6 Feb 2017 17:46:26 +0000 (17:46 +0000)]
Fix requiresCharging false value ignored issue

If a SyncRequest builder is used to create a sync
request and setRequiresCharging(bool) is used,
the sync request requires charging irrespective of
the boolean value provided. This cl fixes the issue.

Bug: 35027396

Test: Tested manually by looking for the charging bit in jobscheduler
dumpsys.

Change-Id: I8f642597a64b8964665f41f5ce9ca71529634069
(cherry picked from commit 3a147230a4813ab8438699e9d997e922ad72f368)

7 years agoMerge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
Agnieszka Madurska [Mon, 6 Feb 2017 19:37:03 +0000 (19:37 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
am: 16edc46ca3

Change-Id: Idb27cb8e19376e11f7ec2e9366c50c8d382cf8ba

7 years agoUse correct APIs to detect conditions for round scrollbars.
Aga Madurska [Mon, 6 Feb 2017 19:37:00 +0000 (19:37 +0000)]
Use correct APIs to detect conditions for round scrollbars.
am: 99485ef841

Change-Id: I8301a27b03d1ba64e48064057f112ebaf38eb6c2

7 years agoMerge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev
Agnieszka Madurska [Mon, 6 Feb 2017 19:30:27 +0000 (19:30 +0000)]
Merge "Use correct APIs to detect conditions for round scrollbars." into cw-f-dev

7 years agoPrevent division-by-zero error when calculating battery capacity.
Ying Wai (Daniel) Fan [Wed, 1 Feb 2017 06:00:10 +0000 (22:00 -0800)]
Prevent division-by-zero error when calculating battery capacity.

Bug: 34255953
Change-Id: Ie072cd5dc26faf17e8ab46ea0795750396f087c2
Fixes: 34255953
Test: formula change CL. No existing unit tests found.

7 years agoMerge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1...
Pavel Grafov [Mon, 6 Feb 2017 17:47:10 +0000 (17:47 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e41a
am: 1f8f29968b

Change-Id: Ib43072f8a6d35c4e297493f49386aafed53a609a

7 years agoFix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
Pavel Grafov [Mon, 6 Feb 2017 17:46:09 +0000 (17:46 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData(). am: 739cda8f31
am: fca679ff74

Change-Id: I9f02c30450e56b8f25bbbe4b1baa2381c84437c8

7 years agoMerge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
Pavel Grafov [Mon, 6 Feb 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
am: 504ca8e41a

Change-Id: I9f880a65827d689aa379ff54138f54422048a59c

7 years agoFix the documentation for SecurityLog.SecurityEvent.getData().
Pavel Grafov [Mon, 6 Feb 2017 17:41:08 +0000 (17:41 +0000)]
Fix the documentation for SecurityLog.SecurityEvent.getData().
am: 739cda8f31

Change-Id: I0c6f1271392bfc9cc8d253d5fa5e029213492b48

7 years agoMerge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev
Pavel Grafov [Mon, 6 Feb 2017 17:35:04 +0000 (17:35 +0000)]
Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev

7 years agoUse correct APIs to detect conditions for round scrollbars.
Aga Madurska [Tue, 31 Jan 2017 13:24:02 +0000 (13:24 +0000)]
Use correct APIs to detect conditions for round scrollbars.

Bug: 34876394

Test: Performed manually.

Change-Id: I9e690e99fd8d925c589ebd19d9c6754eeb63b1d8

7 years agomerge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Sun, 5 Feb 2017 08:09:52 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev

7 years agodocs: Update gluUnProject parameter description.
Ricardo Loo [Sat, 4 Feb 2017 00:38:01 +0000 (18:38 -0600)]
docs: Update gluUnProject parameter description.

Adding missing variable in the output vector.

Originally reported in
http://code.google.com/p/android/issues/detail?id=25143

Change-Id: I91d9ce7e53a9d9cdd890899a0edd49830d533b9b

Bug: 5991013

7 years agoAdd additional logging for temperature readings.
Andrew Sapperstein [Thu, 2 Feb 2017 01:13:08 +0000 (17:13 -0800)]
Add additional logging for temperature readings.

In order to determine how often devices are reaching various
temperatures, we now cache the last hour of temperature readings.
Once it's been an hour, we calculate the avg/min/max and log the results.

Additionally, this CL adds some logging to show how the temperature has
changed over time during the one hour window and what the charging status
is when the notification shows.

Bug: 3451088134379897
Change-Id: If8c7d39452034313fd01dea0c8d97c7b55b3cb9c
Merged-In: I62a5ccc92122f5d2955a52677740e896f0d7892b

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:57:20 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:10:51 +0000 (08:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:10:32 +0000 (08:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:09:59 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:09:38 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:09:02 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:08:31 +0000 (08:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:08:06 +0000 (08:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 3 Feb 2017 08:06:40 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 07:13:19 +0000 (23:13 -0800)]
Import translations. DO NOT MERGE

Change-Id: I048f56389089e4ddda39477a10c935dd5ed00552
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 04:27:50 +0000 (20:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: I0292d15f9ce58b6ae589e9901155dc233da8994e
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:57:19 +0000 (19:57 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4fd53e32bdd8da20d93cd2800fce5bb007c2f5ad
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:53:39 +0000 (19:53 -0800)]
Import translations. DO NOT MERGE

Change-Id: I96c4934556779581110e0e625dd69604f33ea624
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:50:14 +0000 (19:50 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib30b732ba934a3d301d1763dca7642f4c5a9e83a
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:47:04 +0000 (19:47 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic396f6c902a55fc4a5d0e2246c5e6be7a6a310eb
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:30:38 +0000 (19:30 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ica7657382bbe34cb849b6bc07b6bc3f92b04049a
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:19:09 +0000 (19:19 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic4421f63eb2837c54e32b25ddc7160ab50faa308
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 3 Feb 2017 03:15:46 +0000 (19:15 -0800)]
Import translations. DO NOT MERGE

Change-Id: I0ce933b5ea5d86252fad10b0e6aedcd88b57f87f
Auto-generated-cl: translation import

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 01:30:51 +0000 (01:30 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43  -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c
am: 34df10ec98

Change-Id: I74e19a0c1a310084ca5785ed8d8bc5988cce2258

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
Jeff Sharkey [Fri, 3 Feb 2017 01:30:01 +0000 (01:30 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7  -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25
am: 6cfa84791d

Change-Id: Idd62b3a72d5f8daf403100c6a6150b5792c00de7

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
Jeff Sharkey [Fri, 3 Feb 2017 01:28:54 +0000 (01:28 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e  -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148

Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
Jeff Sharkey [Fri, 3 Feb 2017 01:25:30 +0000 (01:25 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0  -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a
am: 8c23d1aadb

Change-Id: I78fd2fdabdbaf2d10f930a0ccc46cb9380b4b5ad