OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Only use saved surface if started by launcher or moved to front"
Chong Zhang [Fri, 26 Aug 2016 19:30:38 +0000 (19:30 +0000)]
Merge "Only use saved surface if started by launcher or moved to front"

7 years agoMerge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev...
Jack Yu [Fri, 26 Aug 2016 18:58:05 +0000 (18:58 +0000)]
Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev am: edaaef304a am: f7b93f30ba
am: 896ca77d1b

Change-Id: I4807691c80a18522801bf580d2f33dd8339b0d6d

7 years agoDo not print misleading debug messages in some scenarios. am: bfd1d6ed49 am: d330f0ccc4
Jack Yu [Fri, 26 Aug 2016 18:55:06 +0000 (18:55 +0000)]
Do not print misleading debug messages in some scenarios. am: bfd1d6ed49 am: d330f0ccc4
am: cc2b91697f

Change-Id: I18d2899cf7ac747a1789e17a2b9786aa9c49c002

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d am...
Bill Yi [Fri, 26 Aug 2016 18:55:02 +0000 (18:55 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d am: 1bf3b41c0c am: b92c637fec
am: 93556e80be

Change-Id: Iad2e2a451fe7f43af9821ac92c85b9d62b1944a9

7 years agoMerge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d am: 3b7c4...
Sergio Giro [Fri, 26 Aug 2016 18:54:58 +0000 (18:54 +0000)]
Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" am: 5d4732555d am: 3b7c46af6f am: abef050951
am: 8d1f3e263b

Change-Id: Ifb323304dcba12e0f7a47506ce4075b2bba05c44

7 years agoMerge "javax.crypto: update classes in javax.crypto (part 2)" am: c7f97dbd57 am:...
Sergio Giro [Fri, 26 Aug 2016 18:54:54 +0000 (18:54 +0000)]
Merge "javax.crypto: update classes in javax.crypto (part 2)" am: c7f97dbd57 am: 1384be9641 am: 8d9a8759af
am: 1537dce75b

Change-Id: Ibcc365a7fe818aefff23a8b463de633b0194a09e

7 years agoMerge "java.security.spec: add public field in MGF1ParameterSpec" am: 5b24bccbc8...
Sergio Giro [Fri, 26 Aug 2016 18:54:51 +0000 (18:54 +0000)]
Merge "java.security.spec: add public field in MGF1ParameterSpec" am: 5b24bccbc8 am: 08b6a09f32 am: 77322b04e6
am: 680d851558

Change-Id: Ie1ab91df8157c7cfcf2bb638d0f3503ca3b03e7d

7 years agoMerge "Add WorkSource to BLE scanning API" am: d0a0ae349c -s ours am: 2fde849eaf...
Jakub Pawlowski [Fri, 26 Aug 2016 18:52:06 +0000 (18:52 +0000)]
Merge "Add WorkSource to BLE scanning API" am: d0a0ae349c  -s ours am: 2fde849eaf am: 9e948dc372
am: 00f5c5d71a

Change-Id: I51497e20f0cf3223f6b408327d88017aff1d1a3b

7 years agoMerge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc...
Steve McKay [Fri, 26 Aug 2016 18:52:03 +0000 (18:52 +0000)]
Merge "DO NOT MERGE: Don't create DocumentInfo instances in background." into nyc-mr1-dev am: 850912db88 am: b9b65370b7
am: f0dad8965a  -s ours

Change-Id: I52c74890301b8c1103305ed98b04d04c8cf0927a

7 years agoDO NOT MERGE: Don't create DocumentInfo instances in background. am: b818058f4e am...
Steve McKay [Fri, 26 Aug 2016 18:52:00 +0000 (18:52 +0000)]
DO NOT MERGE: Don't create DocumentInfo instances in background. am: b818058f4e am: 89eb830a73
am: 7c3d2339ba  -s ours

Change-Id: Ib1aaadef3acb9e82d97f66acf4c7503de0738bf8

7 years agoMerge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958...
Salvador Martinez [Fri, 26 Aug 2016 18:51:57 +0000 (18:51 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958 am: e9c519e049 am: e8e7f1b88a am: 347f0c6612
am: b510dedc93

Change-Id: I95772ea8eb6504c8249daf394d8e61bc7eadee73

7 years agoAdded error handling to settings suggestions list am: 18bf581c77 am: 2cb851e5c9 am...
Salvador Martinez [Fri, 26 Aug 2016 18:51:53 +0000 (18:51 +0000)]
Added error handling to settings suggestions list am: 18bf581c77 am: 2cb851e5c9 am: cfa4ad4e1e am: b14e30fc84
am: ccbdba0444

Change-Id: I5bbf93c1f100a17a7da8340a399d60578d883313

7 years agoMerge "Ensure the layer drawable callback is set when loading from theme" into nyc...
Alan Viverette [Fri, 26 Aug 2016 18:30:21 +0000 (18:30 +0000)]
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev am: 709f0f3e15 am: 352ccc9f84
am: af64ae8147

Change-Id: I279a26f23b3f03ee3fc9d47e1cae3539ffb964a9

7 years agoEnsure the layer drawable callback is set when loading from theme am: 11a84b8429...
Alan Viverette [Fri, 26 Aug 2016 18:29:42 +0000 (18:29 +0000)]
Ensure the layer drawable callback is set when loading from theme am: 11a84b8429 am: 3deb906397
am: caf68d0355

Change-Id: I2a61c5412cedce03612047aacce852451d16710e

7 years agoMerge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into...
Alan Viverette [Fri, 26 Aug 2016 18:28:48 +0000 (18:28 +0000)]
Merge "Improve docs for GradientDrawable's useLevel and centerX/Y properties" into nyc-mr1-dev am: 20109a689d am: 56d8f4e2b4
am: f19cbf8c87

Change-Id: I6a5bf7a7eed73db25410f864413b542ccef08051

7 years agoImprove docs for GradientDrawable's useLevel and centerX/Y properties am: daec5506c4...
Alan Viverette [Fri, 26 Aug 2016 18:27:37 +0000 (18:27 +0000)]
Improve docs for GradientDrawable's useLevel and centerX/Y properties am: daec5506c4 am: cc914b6b0b
am: 35a7e106ef

Change-Id: I1357fcc227c48259e15eef74e67d86f21fcec163

7 years agoMerge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev am: 16b8941dba...
Alan Viverette [Fri, 26 Aug 2016 18:26:49 +0000 (18:26 +0000)]
Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev am: 16b8941dba am: 040e5d8ce3
am: ff9a4c752c

Change-Id: Ic68ff5fa3c19935aa71f3e067b3e98b90aaea49d

7 years agoClean up VideoView, SurfaceView constructors am: 768ca7d19b am: 9af5e5b31b
Alan Viverette [Fri, 26 Aug 2016 18:26:04 +0000 (18:26 +0000)]
Clean up VideoView, SurfaceView constructors am: 768ca7d19b am: 9af5e5b31b
am: 54131127e8

Change-Id: I8e10d0145e84489707623a934df352e61654a57c

7 years agoMerge "Constrain input hour and minute to valid range" into nyc-mr1-dev am: 4e32b47c4...
Alan Viverette [Fri, 26 Aug 2016 18:24:39 +0000 (18:24 +0000)]
Merge "Constrain input hour and minute to valid range" into nyc-mr1-dev am: 4e32b47c48 am: 31be04fddd
am: bb40a4cfe4

Change-Id: I207834be8d5d7443f7ff22dfeb9df67a1ca0af79

7 years agoMerge "resolve merge conflicts of 1095b21 to master"
TreeHugger Robot [Fri, 26 Aug 2016 18:20:32 +0000 (18:20 +0000)]
Merge "resolve merge conflicts of 1095b21 to master"

7 years agoMerge "Various doc cleanups"
TreeHugger Robot [Fri, 26 Aug 2016 17:37:06 +0000 (17:37 +0000)]
Merge "Various doc cleanups"

7 years agoMerge "Clarify docs for various methods in View"
Chet Haase [Fri, 26 Aug 2016 17:16:21 +0000 (17:16 +0000)]
Merge "Clarify docs for various methods in View"

7 years agoMerge "NetworkSelectionStatus: Fix copy constructor"
Roshan Pius [Fri, 26 Aug 2016 17:10:23 +0000 (17:10 +0000)]
Merge "NetworkSelectionStatus: Fix copy constructor"

7 years agoOnly use saved surface if started by launcher or moved to front
Chong Zhang [Thu, 25 Aug 2016 19:12:33 +0000 (12:12 -0700)]
Only use saved surface if started by launcher or moved to front

Restrict saved surface to launcher start (ACTION_MAIN&CATEGORY_
LAUNCHER), or there is no intent at all (eg. task being brought to
front). If the intent is something else, likely the app is going
to show some specific page or view, instead of what's left last time.

This solves problems like the launcher shortcuts on DeckClock,
each of them is a different intent and will show one specific
view regardless of last states. Another example is Chrome tab
opened directly by action VIEW to open some URL.

(Note that this doesn't solve the problem with Chrome homescreen
shortcuts, it will still start with saved surface (if Chrome
is already open). This is because the shortcut is a trampoline
activity that starts the real chrome tab activity, but when
the trampoline is started, the whole task is already brought
to front, and ChromeTab could become visible with the task
before we actually start it.)

bug:27747315

Change-Id: Id3e61c61ef516b0edc1f174320f02661222f226b

7 years agoMerge "Do not start new threads in AccountManagerService"
Fyodor Kupolov [Fri, 26 Aug 2016 16:52:26 +0000 (16:52 +0000)]
Merge "Do not start new threads in AccountManagerService"

7 years agoMerge "Don't statically include mockito-target"
Guang Zhu [Fri, 26 Aug 2016 15:50:26 +0000 (15:50 +0000)]
Merge "Don't statically include mockito-target"

7 years agoVarious doc cleanups
Chet Haase [Thu, 25 Aug 2016 22:35:53 +0000 (15:35 -0700)]
Various doc cleanups

Issue #6439958  More R.attr breakage
Issue #918412  android.graphics.Paint.FontMetricsInt fields & methods need doc
Issue #917387  javadoc bug: Canvas.EdgeType has minimal documentation
Issue #18948460 [DAC-bug] LinearLayout xml layout_weight parameter is missing description

Change-Id: Idb289ca778b3f316923757405460031ce7a5e1e9

7 years agoAdd DevicePolicyManager.setBackupServiceEnabled as hidden API.
Vladislav Kuzkokov [Thu, 18 Aug 2016 17:01:27 +0000 (19:01 +0200)]
Add DevicePolicyManager.setBackupServiceEnabled as hidden API.

BUG=28628532

Change-Id: I48c3423734e54b6a4d70e58d50c98c3e17790e0d

7 years agoDon't statically include mockito-target
Guang Zhu [Fri, 26 Aug 2016 07:36:54 +0000 (00:36 -0700)]
Don't statically include mockito-target

all modules using this library are already including it

Bug: 31072145
Test: make checkbuild
Change-Id: I27a39aff558fce7e4cf01efd5942f694f4824f0c

7 years agoresolve merge conflicts of 1095b21 to master
Colin Cross [Fri, 26 Aug 2016 05:18:33 +0000 (22:18 -0700)]
resolve merge conflicts of 1095b21 to master

Change-Id: I611579044234435a07cad2f64930b731e53aec77

7 years agoMerge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958...
Salvador Martinez [Fri, 26 Aug 2016 03:56:10 +0000 (03:56 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958 am: 3253853473
am: d7525aeb78

Change-Id: Icef0c6d631dbe4b9b39ec1770b68968f31427e26

7 years agoAdded error handling to settings suggestions list am: 18bf581c77 am: 23af0c020b
Salvador Martinez [Fri, 26 Aug 2016 03:56:06 +0000 (03:56 +0000)]
Added error handling to settings suggestions list am: 18bf581c77 am: 23af0c020b
am: 9dc5630fbe

Change-Id: I7ee5642c1140fd06971439295afa710f554bfc32

7 years agoMerge changes from topic 'am-25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev am:...
Chen Xu [Fri, 26 Aug 2016 03:40:02 +0000 (03:40 +0000)]
Merge changes from topic 'am-25ded4410ce544918d9fbc387ab4e1e3' into cw-f-dev am: 8ae79de881
am: 75df3604d6

Change-Id: I03ee3c7ca2675b7535dfc254f22ccc76342cf348

7 years agoMerge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am: d90b6...
Chen Xu [Fri, 26 Aug 2016 03:39:28 +0000 (03:39 +0000)]
Merge "redact PII only for non-null value and apply SHA-1" into nyc-mr1-dev am: d90b69ffb1 am: 3e73c0c93e
am: b15d295224

Change-Id: I6af362f8291b364b46ab0c957e273c124e30a20b

7 years agoredact PII only for non-null value and apply SHA-1 am: d0a7649f53 am: 00396c01f6
fionaxu [Fri, 26 Aug 2016 03:38:39 +0000 (03:38 +0000)]
redact PII only for non-null value and apply SHA-1 am: d0a7649f53 am: 00396c01f6
am: 7ae64354f9

Change-Id: Idfe56dbfb17c9453335074873f1b036c23e21a58

7 years agoMerge "Remove the incognito start page resource." into cw-f-dev am: e914569fb8
Andrew Rossignol [Fri, 26 Aug 2016 03:38:33 +0000 (03:38 +0000)]
Merge "Remove the incognito start page resource." into cw-f-dev am: e914569fb8
am: 971eb36d1b

Change-Id: Ie56c4be7fa1c4db240351ae54ddeab17cb3507f6

7 years agoRemove the incognito start page resource. am: 09bd81cdfe
Andrew Rossignol [Fri, 26 Aug 2016 03:38:28 +0000 (03:38 +0000)]
Remove the incognito start page resource. am: 09bd81cdfe
am: 85ddf3de1b

Change-Id: I6315828accec9bf98ad803caeec663b364a13949

7 years agoMerge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev am:...
Doris Ling [Fri, 26 Aug 2016 03:38:18 +0000 (03:38 +0000)]
Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev am: d5f9642488 am: 6165a83ee8
am: c13f012a67

Change-Id: I1b1b2ae772e1fad028206e91b57fe338cf956e78

7 years agoAdd metrics logging for Settings -> Help & Feedback am: 319c806cc0 am: 589ffca4de
Doris Ling [Fri, 26 Aug 2016 03:38:08 +0000 (03:38 +0000)]
Add metrics logging for Settings -> Help & Feedback am: 319c806cc0 am: 589ffca4de
am: 3fed1672ba  -s ours

Change-Id: Iaf596780f5b9032d1c0bbd481e826f41a8b0e698

7 years agoNetworkSelectionStatus: Fix copy constructor
Roshan Pius [Fri, 26 Aug 2016 02:47:06 +0000 (19:47 -0700)]
NetworkSelectionStatus: Fix copy constructor

Add couple of missing elements in the NetworkSelectionStatus copy constructor.

BUG: 31102798
Change-Id: Ie5f3719b94acf021d4ae2756afd635388640168c

7 years agoMerge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f2...
Alan Viverette [Fri, 26 Aug 2016 02:25:16 +0000 (02:25 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f77f am: f9489216eb am: 6c1e7451b3 am: 57143be4e4
am: 1d44132548

Change-Id: Ic1c02ac525769639b324c25c72fbfea5f6cefa1a

7 years agoAvoid potential re-entry as a result of child mutation am: 66b3a0d1aa am: 70ccc698ec...
Alan Viverette [Fri, 26 Aug 2016 02:25:11 +0000 (02:25 +0000)]
Avoid potential re-entry as a result of child mutation am: 66b3a0d1aa am: 70ccc698ec am: 992ef58a33 am: cc0e9d795e
am: 532871d7a4

Change-Id: I4c9af4d3e94291233b808415bab08f34152f3c42

7 years agoMerge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f2...
Alan Viverette [Fri, 26 Aug 2016 02:25:07 +0000 (02:25 +0000)]
Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f77f am: 550e677563
am: 6283283f53

Change-Id: I44e2716406a075430bd4098f545ecdd78c5fa287

7 years agoAvoid potential re-entry as a result of child mutation am: 66b3a0d1aa am: 387ebba861
Alan Viverette [Fri, 26 Aug 2016 02:25:03 +0000 (02:25 +0000)]
Avoid potential re-entry as a result of child mutation am: 66b3a0d1aa am: 387ebba861
am: 2d57b595b6

Change-Id: I9d32bce54f5ea1e13ca4baf1ca52b09128a96a34

7 years agoMerge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev am...
Tony Mantler [Fri, 26 Aug 2016 02:21:28 +0000 (02:21 +0000)]
Merge "Fix AsyncTask to handle exceptions in doInBackground" into nyc-mr1-dev am: 97231323b7 am: b07fc2c9bf
am: e4d91efadf

Change-Id: Iab00e2c55f6b8f4af1fff9dc2f1b5abba2f7cf19

7 years agoFix AsyncTask to handle exceptions in doInBackground am: 78a8e9d293 am: 7697ba2602
Tony Mantler [Fri, 26 Aug 2016 02:21:21 +0000 (02:21 +0000)]
Fix AsyncTask to handle exceptions in doInBackground am: 78a8e9d293 am: 7697ba2602
am: 965596c53a

Change-Id: I5879054fdacc571a94a5b23b472865b7eb25c07d

7 years agoMerge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev-plus-aosp
Randy Pan [Fri, 26 Aug 2016 02:21:14 +0000 (02:21 +0000)]
Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev-plus-aosp
am: ba93096c3a

Change-Id: Ieb5827fad4a3fe54fd3ca11951cc28e30720b05b

7 years agoDeprecate QNS network disable reason BAD_LINK
Randy Pan [Fri, 26 Aug 2016 02:21:08 +0000 (02:21 +0000)]
Deprecate QNS network disable reason BAD_LINK
am: 4156d61570

Change-Id: Ieeda34d8c764789e978905cf6847dd8925f5250b

7 years agoMerge "Add an new internal DrawableContainer to handle animation scale == 0 case...
Tenghui Zhu [Fri, 26 Aug 2016 02:16:09 +0000 (02:16 +0000)]
Merge "Add an new internal DrawableContainer to handle animation scale == 0 case." into nyc-mr1-dev am: 3512b0001a am: f286d846f0
am: f121cb7059

Change-Id: I4b54e572294ea75c1e65016c527f558d75063c1d

7 years agoAdd an new internal DrawableContainer to handle animation scale == 0 case. am: 0c0366...
Teng-Hui Zhu [Fri, 26 Aug 2016 02:15:07 +0000 (02:15 +0000)]
Add an new internal DrawableContainer to handle animation scale == 0 case. am: 0c03664fa6 am: 0bc9fa9896
am: ab2ed1a4e7

Change-Id: I2de378da33ca93639c03544c8702e17eaefee514

7 years agoframeworks/base: add changes coming from aosp am: 29835cc56e am: 263820bb2c
Sergio Giro [Fri, 26 Aug 2016 00:29:42 +0000 (00:29 +0000)]
frameworks/base: add changes coming from aosp am: 29835cc56e am: 263820bb2c
am: d141086546

Change-Id: I42f2c159a7c93756a447c669b9240dbdec298ba3

7 years agoMerge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev am: 4d826638ab...
Rubin Xu [Fri, 26 Aug 2016 00:27:03 +0000 (00:27 +0000)]
Merge "Set DeviceLockedForUser state synchronously" into nyc-mr1-dev am: 4d826638ab am: 50c5f4ac38
am: 716cd2b77f

Change-Id: I42ed8b7a1f59b2dff7b577cbe4ed9d95b58d5f2c

7 years agoSet DeviceLockedForUser state synchronously am: 9201a30a95 am: 6b3c49d2b8
Rubin Xu [Fri, 26 Aug 2016 00:26:59 +0000 (00:26 +0000)]
Set DeviceLockedForUser state synchronously am: 9201a30a95 am: 6b3c49d2b8
am: caca00db8f

Change-Id: I7261c824ff001a3d811cbc8ed75349d5255fe1fd

7 years agoMerge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev am:...
Jaewan Kim [Fri, 26 Aug 2016 00:26:54 +0000 (00:26 +0000)]
Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev am: 473c683ca6 am: 09a7a7b9f8
am: eb7394cebe

Change-Id: I76f7ed72460573537cfaa7315b8e2ef61140a218

7 years agoMediaSessionService: Leave log for media key events am: 5e1476ecd7 am: ed3fd2743c
Jaewan Kim [Fri, 26 Aug 2016 00:26:51 +0000 (00:26 +0000)]
MediaSessionService: Leave log for media key events am: 5e1476ecd7 am: ed3fd2743c
am: 8ff30f3441

Change-Id: If011975ef32b3e6788029556f81423c5e1906dee

7 years agoMerge "ExifInterface: Make saveAttributes throw an exception before change" into...
Sungsoo Lim [Fri, 26 Aug 2016 00:26:45 +0000 (00:26 +0000)]
Merge "ExifInterface: Make saveAttributes throw an exception before change" into nyc-mr1-dev am: c23c2771de am: 9b5106a438
am: 17e9a2a42c

Change-Id: Ia07bc8622e504e54b18d1685e8b5d753b889333b

7 years agoMerge "resolve merge conflicts of 77a7787 to master"
Colin Cross [Fri, 26 Aug 2016 00:23:35 +0000 (00:23 +0000)]
Merge "resolve merge conflicts of 77a7787 to master"

7 years agoClarify docs for various methods in View
Chet Haase [Thu, 25 Aug 2016 21:38:21 +0000 (14:38 -0700)]
Clarify docs for various methods in View

Issue #6440615 Doc problems in android.view.View

Change-Id: I34b9355c0473ac6fbfd8967f2106abc79fac5f86

7 years agoDo not start new threads in AccountManagerService
Fyodor Kupolov [Thu, 25 Aug 2016 22:25:40 +0000 (15:25 -0700)]
Do not start new threads in AccountManagerService

Created a dedicated foreground ServiceThread for AccountManagerService.
All async work that cannot be done on the main thread should be done there.

Bug: 30469204
Bug: 24735732
Change-Id: I93caeb2b2414dc39398504bffec5f9ceb7105f72

7 years agoMerge "Adds framework support for hidl-gen Java backend. (to support structs)"
Andreas Huber [Thu, 25 Aug 2016 22:22:59 +0000 (22:22 +0000)]
Merge "Adds framework support for hidl-gen Java backend. (to support structs)"

7 years agoMerge "Add granular profiling to every SystemServer step."
TreeHugger Robot [Thu, 25 Aug 2016 22:04:06 +0000 (22:04 +0000)]
Merge "Add granular profiling to every SystemServer step."

7 years agoresolve merge conflicts of 77a7787 to master
Colin Cross [Thu, 25 Aug 2016 22:01:52 +0000 (15:01 -0700)]
resolve merge conflicts of 77a7787 to master

Change-Id: I17f14a88b5b654a8860a09f610e797af15cedecc

7 years agoMerge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev am...
Winson [Thu, 25 Aug 2016 21:51:19 +0000 (21:51 +0000)]
Merge "Fixing issue with toasts not showing for guest users." into nyc-mr1-dev am: e846b18d33 am: 1abd27f466
am: e13dc676b0

Change-Id: Iedb3471ad4f79df21b1a2c9875367425e846d779

7 years agoFixing issue with toasts not showing for guest users. am: 675c5d8e5a am: fcf8f8382b
Winson [Thu, 25 Aug 2016 21:51:13 +0000 (21:51 +0000)]
Fixing issue with toasts not showing for guest users. am: 675c5d8e5a am: fcf8f8382b
am: 8a01cd988b

Change-Id: Idc3faee4eaf5aa0bbcce639820db953438fe10ec

7 years agoMerge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1...
Jorim Jaggi [Thu, 25 Aug 2016 21:50:29 +0000 (21:50 +0000)]
Merge "Don't use fullscreen theme for forced resizable info activity" into nyc-mr1-dev am: 6e370d35fe am: 2bf085a3b4
am: 96bdc189ba

Change-Id: I5abce910a4c07edf788cb28346aebe81286dc36e

7 years agoDon't use fullscreen theme for forced resizable info activity am: 3f09052eb9 am:...
Jorim Jaggi [Thu, 25 Aug 2016 21:50:23 +0000 (21:50 +0000)]
Don't use fullscreen theme for forced resizable info activity am: 3f09052eb9 am: b0ba9599c8
am: 403a545e87

Change-Id: I109f607cf3c319f70e707e996f697d2185e031e5

7 years agoMerge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev am: 5a10360d7e am: 9a0d881e3c
Jorim Jaggi [Thu, 25 Aug 2016 21:47:06 +0000 (21:47 +0000)]
Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev am: 5a10360d7e am: 9a0d881e3c
am: e4b367b8b6

Change-Id: I9cc63c252729b63097578e58a87ae4914eb8392c

7 years agoRemove swipe-up gesture from Tuner am: 3793aff806 am: 55f4b0e9be
Jorim Jaggi [Thu, 25 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Remove swipe-up gesture from Tuner am: 3793aff806 am: 55f4b0e9be
am: 76821e7c36

Change-Id: I772d743a1e1e243a1b34988c4c5dea576ec41b9e

7 years agoMerge "use directory timestamp during OTA" into nyc-mr1-dev am: f50ff35cea am: d2247b0724
Todd Kennedy [Thu, 25 Aug 2016 21:46:57 +0000 (21:46 +0000)]
Merge "use directory timestamp during OTA" into nyc-mr1-dev am: f50ff35cea am: d2247b0724
am: 71d4ee1d38

Change-Id: I06148251deeb7ff943a9e57e1e620cfb5d420e43

7 years agouse directory timestamp during OTA am: 095d4125be am: 9366047713
Todd Kennedy [Thu, 25 Aug 2016 21:46:53 +0000 (21:46 +0000)]
use directory timestamp during OTA am: 095d4125be am: 9366047713
am: e3761ac4d9

Change-Id: Id74d2d751607f20c340b877d43dca12361a0d044

7 years agoMerge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev...
Justin Klaassen [Thu, 25 Aug 2016 21:46:49 +0000 (21:46 +0000)]
Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev am: ee36020457 am: d64ec9b709
am: e489d3c03c

Change-Id: Icfa0097c578c54ce26beb548bbf4af04ddc88a8a

7 years agoImprove logging for NightDisplayService/TwilightService am: ec8837ae26 am: 33b64cba51
Justin Klaassen [Thu, 25 Aug 2016 21:37:35 +0000 (21:37 +0000)]
Improve logging for NightDisplayService/TwilightService am: ec8837ae26 am: 33b64cba51
am: f0f047e702

Change-Id: Iea43f66e508e2f2e5c62033b6768d28991161b8d

7 years agoBump up preloading recents on boot up to user unlocked. am: c3eedd972d am: 3174f2931b
Winson [Thu, 25 Aug 2016 21:37:31 +0000 (21:37 +0000)]
Bump up preloading recents on boot up to user unlocked. am: c3eedd972d am: 3174f2931b
am: 420701ee20

Change-Id: Id1cb81a7aeb501bf07d5fa36c04875757f3bc8b1

7 years agoMerge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev am: 8664df3d7...
Makoto Onuki [Thu, 25 Aug 2016 21:37:24 +0000 (21:37 +0000)]
Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev am: 8664df3d76 am: 311484cc4e
am: 6a8fecf789

Change-Id: I009bbd7cd80794c91ff0895482593c009029a876

7 years agoBackporting shortcut manager test utils to mr1 am: a49bafad6b am: d76622fbc1
Makoto Onuki [Thu, 25 Aug 2016 21:35:41 +0000 (21:35 +0000)]
Backporting shortcut manager test utils to mr1 am: a49bafad6b am: d76622fbc1
am: 87df8d63d0

Change-Id: I50351306ca865cea0e974f122f76a1d221834644

7 years agoMerge "Only sync adapters with access can see an account - framework" into nyc-mr1...
Svetoslav Ganov [Thu, 25 Aug 2016 21:34:32 +0000 (21:34 +0000)]
Merge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev am: 0f7fe17983 am: 909bb94eb2
am: f77a2fcc68

Change-Id: Ic36142dbf350e45dfa8e7a7dc706571085d02a4c

7 years agoMerge "Document and deprecate various old, undocumented classes"
TreeHugger Robot [Thu, 25 Aug 2016 21:05:57 +0000 (21:05 +0000)]
Merge "Document and deprecate various old, undocumented classes"

7 years agoMerge "Avoid JUnit4 collision in android-support-test, mockito-target"
Guang Zhu [Thu, 25 Aug 2016 20:42:24 +0000 (20:42 +0000)]
Merge "Avoid JUnit4 collision in android-support-test, mockito-target"

7 years agoAdds framework support for hidl-gen Java backend. (to support structs)
Andreas Huber [Thu, 25 Aug 2016 18:21:21 +0000 (11:21 -0700)]
Adds framework support for hidl-gen Java backend. (to support structs)

Bug: 30575790
Change-Id: Ida30d8fe7a1b210e98f1a0ea5d429a0112f9ef3f

7 years agoMerge "Modernize RenderNode JNI"
John Reck [Thu, 25 Aug 2016 20:30:54 +0000 (20:30 +0000)]
Merge "Modernize RenderNode JNI"

7 years agoAdd granular profiling to every SystemServer step.
Vitalii Tomkiv [Thu, 21 Jul 2016 22:58:24 +0000 (15:58 -0700)]
Add granular profiling to every SystemServer step.

In attempt to speed up Android Boot time we need better understand parts
that are taking long time during boot phase. SystemServer accounts to
~30-40% of boot time, so profiling and monitoring it should help
identify problematic parts.

Along with systrace logcat messages were added to simplify on the glance
check of boot process timing without the need to collect systrace.

Change-Id: Ice203eb3e6aa662d1a7cefc8bcd76f372347f4a0

7 years agoMerge "Add Bool* APIs to HwParcel."
Andreas Huber [Thu, 25 Aug 2016 19:46:03 +0000 (19:46 +0000)]
Merge "Add Bool* APIs to HwParcel."

7 years agoDocument and deprecate various old, undocumented classes
Chet Haase [Thu, 25 Aug 2016 15:47:20 +0000 (08:47 -0700)]
Document and deprecate various old, undocumented classes

These classes are mostly undocumented and, in some cases, completely
unobvious in what they do or how to use them. In some cases, I added
docs to explain the API. In other cases (ProgressDialog, ZoomButton,
DialerFilter), I deprecated the classes because there are far better ways
to accomplish that functionality with today's platform.

Issue #2164052 Underdocumented classes in Eclair

Change-Id: Ief0e7267852c2cb3c5ae604b3d902d66c89f4cd3

7 years agoAvoid JUnit4 collision in android-support-test, mockito-target
Guang Zhu [Wed, 24 Aug 2016 17:49:23 +0000 (10:49 -0700)]
Avoid JUnit4 collision in android-support-test, mockito-target

Bug: 31072145
Test: make droid checkbuild

Change-Id: I1462b0ba70aa3ede1a5b2ccc407e234dea1eb1b2

7 years agoMerge "Add missing comment."
TreeHugger Robot [Thu, 25 Aug 2016 17:17:48 +0000 (17:17 +0000)]
Merge "Add missing comment."

7 years agoMerge "Add ConfigUpdater service for CT logs"
Chad Brubaker [Thu, 25 Aug 2016 17:05:37 +0000 (17:05 +0000)]
Merge "Add ConfigUpdater service for CT logs"

7 years agoAdd missing comment.
Rubin Xu [Thu, 25 Aug 2016 15:38:11 +0000 (16:38 +0100)]
Add missing comment.

Change-Id: I78b24c0a56e0f06a692e6e5665873c994241a487

7 years agoMerge "Allow DO to factory reset if it has set DISALLOW_FACTORY_RESET."
Nicolas Prévot [Thu, 25 Aug 2016 11:23:24 +0000 (11:23 +0000)]
Merge "Allow DO to factory reset if it has set DISALLOW_FACTORY_RESET."

7 years agoMerge "allow external USB host management"
Vitalii Tomkiv [Wed, 24 Aug 2016 23:58:15 +0000 (23:58 +0000)]
Merge "allow external USB host management"

7 years agoAdd Bool* APIs to HwParcel.
Andreas Huber [Wed, 24 Aug 2016 23:19:03 +0000 (16:19 -0700)]
Add Bool* APIs to HwParcel.

Bug: 31045584
Change-Id: I202c4aa7caf92a4cd7e3a45ef6784638e41facc8

7 years agoModernize RenderNode JNI
John Reck [Wed, 24 Aug 2016 20:22:37 +0000 (13:22 -0700)]
Modernize RenderNode JNI

Change-Id: I455271647f01f3ac8ceb73359a51a2d2720fdd47

7 years agoMerge "Add misc apct perf tests"
Chris Craik [Wed, 24 Aug 2016 22:46:52 +0000 (22:46 +0000)]
Merge "Add misc apct perf tests"

7 years agoallow external USB host management
Keun-young Park [Tue, 5 Jan 2016 21:27:29 +0000 (13:27 -0800)]
allow external USB host management

- Setting config_UsbDeviceConnectionHandling_component leads into
  launching specified Activity whenever USB device is connected.
- This allows external Activity to manage USB device based on
  its own setup and settings.
- Device access can be passed to other app with permission update
  by UsbManager.grantPermission.
- added UsbDeviceConnection.resetDevice() to reset USB device connected.
  This is necessary to get device out from AOAP.
- Test requires installing UsbHostExternalManagmentTestApp and
  AoapTestHost to USB host, and AoapTestDevice to USB Device.

bug: 26404209
Change-Id: I8e77ddc646c15454d9b2ecf1356924cf6351fc28

7 years agoMerge "Refactored whitelist restrict background uids."
TreeHugger Robot [Wed, 24 Aug 2016 21:38:48 +0000 (21:38 +0000)]
Merge "Refactored whitelist restrict background uids."

7 years agoMerge "resolve merge conflicts of eeeebd3 to master"
Svetoslav Ganov [Wed, 24 Aug 2016 20:59:35 +0000 (20:59 +0000)]
Merge "resolve merge conflicts of eeeebd3 to master"

7 years agoMerge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev...
Jack Yu [Wed, 24 Aug 2016 20:54:11 +0000 (20:54 +0000)]
Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev am: edaaef304a
am: f7b93f30ba

Change-Id: Ice020ddaab0716532f5955a30507eb79bb4d490a

7 years agoDo not print misleading debug messages in some scenarios. am: bfd1d6ed49
Jack Yu [Wed, 24 Aug 2016 20:54:08 +0000 (20:54 +0000)]
Do not print misleading debug messages in some scenarios. am: bfd1d6ed49
am: d330f0ccc4

Change-Id: Ia264715fe843b1b272da6ca909edc3be6fd57b28

7 years agoMerge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev
Jack Yu [Wed, 24 Aug 2016 20:38:15 +0000 (20:38 +0000)]
Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev
am: edaaef304a

Change-Id: Id3081f8874ac3e984cbb7cf3f446725a429a8a5c

7 years agoDo not print misleading debug messages in some scenarios.
Jack Yu [Wed, 24 Aug 2016 20:38:12 +0000 (20:38 +0000)]
Do not print misleading debug messages in some scenarios.
am: bfd1d6ed49

Change-Id: I792c8bb85abb4e7207631bd8cbdbcc1a7ae2eb54

7 years agoMerge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d am...
Bill Yi [Wed, 24 Aug 2016 20:32:08 +0000 (20:32 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e71ecb2c4d am: 1bf3b41c0c
am: b92c637fec

Change-Id: I7594dc32c819bc856d879dd9b5f85cef7e9a7c77