OSDN Git Service

android-x86/frameworks-base.git
7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 22 Dec 2016 02:26:47 +0000 (18:26 -0800)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Renamed "Demo mode" to "System UI demo mode""
Sean Stout [Wed, 21 Dec 2016 19:36:49 +0000 (19:36 +0000)]
Merge "Renamed "Demo mode" to "System UI demo mode""

7 years agoMerge "Finish up API for missing content:// flags."
Jeff Sharkey [Wed, 21 Dec 2016 19:28:01 +0000 (19:28 +0000)]
Merge "Finish up API for missing content:// flags."

7 years agoMerge "Merge "DO NOT MERGE - Delete the separate grid recents activity and related...
Android Build Merger (Role) [Wed, 21 Dec 2016 18:50:08 +0000 (18:50 +0000)]
Merge "Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev am: 09c0fdca7b am: ceebe36a17  -s ours"

7 years agoMerge "Relax protected broadcast checks for shell."
Jeff Sharkey [Wed, 21 Dec 2016 18:49:26 +0000 (18:49 +0000)]
Merge "Relax protected broadcast checks for shell."

7 years agoMerge "DO NOT MERGE - Delete the separate grid recents activity and related code...
Manu Cornet [Wed, 21 Dec 2016 18:49:23 +0000 (18:49 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev am: 09c0fdca7b
am: ceebe36a17  -s ours

Change-Id: Iaad62a9f61be795b774935a8001309542a4349ea

7 years agoMerge "DO NOT MERGE - Delete the separate grid recents activity and related code...
Android Build Merger (Role) [Wed, 21 Dec 2016 18:47:01 +0000 (18:47 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code am: e93f8100a6 am: 15b6c78534  -s ours"

7 years agoDO NOT MERGE - Delete the separate grid recents activity and related code am: e93f8100a6
Manu Cornet [Wed, 21 Dec 2016 18:46:16 +0000 (18:46 +0000)]
DO NOT MERGE - Delete the separate grid recents activity and related code am: e93f8100a6
am: 15b6c78534  -s ours

Change-Id: Ib0e4db2823ba7ddd70c41f9b60b97f5c3e5e5fe7

7 years agoMerge "Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev am: 639f95dd13 am...
Android Build Merger (Role) [Wed, 21 Dec 2016 18:45:54 +0000 (18:45 +0000)]
Merge "Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev am: 639f95dd13 am: 6ee226f6e6"

7 years agoMerge "Revert "Settings recovery support""
Fyodor Kupolov [Wed, 21 Dec 2016 18:45:44 +0000 (18:45 +0000)]
Merge "Revert "Settings recovery support""

7 years agoMerge changes from topic 'diskstats-mr2' into nyc-mr2-dev am: 639f95dd13
Daniel Nishi [Wed, 21 Dec 2016 18:45:08 +0000 (18:45 +0000)]
Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev am: 639f95dd13
am: 6ee226f6e6

Change-Id: I5bc188cec8da267e046aa1d9bb5aaa2338a0ecd7

7 years agoMerge changes from topic 'am-caa9190d4d3243e3bd21c7d512d1026a'
Android Build Merger (Role) [Wed, 21 Dec 2016 18:44:16 +0000 (18:44 +0000)]
Merge changes from topic 'am-caa9190d4d3243e3bd21c7d512d1026a'

* changes:
  Augment diskstats dumpsys to have categorization and apps. am: 090b2d9d6c am: f1312cd68e
  Add a file collector to the platform. am: be770dce08 am: a9d8602787  -s ours
  Merge "Add an app size collector." into nyc-mr2-dev am: 8fd55702b1 am: 9bd20ab6c9
  Add an app size collector. am: c7d9de59bf am: f5e2f1ae38  -s ours

7 years agoAugment diskstats dumpsys to have categorization and apps. am: 090b2d9d6c
Daniel Nishi [Wed, 21 Dec 2016 18:42:21 +0000 (18:42 +0000)]
Augment diskstats dumpsys to have categorization and apps. am: 090b2d9d6c
am: f1312cd68e

Change-Id: I0b806397068dcb1551081695d6301fed639532c6

7 years agoAdd a file collector to the platform. am: be770dce08
Daniel Nishi [Wed, 21 Dec 2016 18:41:03 +0000 (18:41 +0000)]
Add a file collector to the platform. am: be770dce08
am: a9d8602787  -s ours

Change-Id: I24f4f8e829ce15dd55a91385ac8d1e622caf0c08

7 years agoMerge "Add an app size collector." into nyc-mr2-dev am: 8fd55702b1
Daniel Nishi [Wed, 21 Dec 2016 18:40:02 +0000 (18:40 +0000)]
Merge "Add an app size collector." into nyc-mr2-dev am: 8fd55702b1
am: 9bd20ab6c9

Change-Id: Idb68b4178105c60f6c9bbaa3b87c712603d5153c

7 years agoMerge "Add DocumentsContract#ACTION_DOCUMENT_SETTINGS and Documents#FLAG_SUPPORTS_SET...
Ben Lin [Wed, 21 Dec 2016 18:39:46 +0000 (18:39 +0000)]
Merge "Add DocumentsContract#ACTION_DOCUMENT_SETTINGS and Documents#FLAG_SUPPORTS_SETTINGS."

7 years agoAdd an app size collector. am: c7d9de59bf
Daniel Nishi [Wed, 21 Dec 2016 18:39:02 +0000 (18:39 +0000)]
Add an app size collector. am: c7d9de59bf
am: f5e2f1ae38  -s ours

Change-Id: I49364545deb6a857d21c33fab2bebd8bd590b666

7 years agomedia volume --get outputs the current volume
Frank Barchard [Tue, 20 Dec 2016 01:22:00 +0000 (17:22 -0800)]
media volume --get outputs the current volume

Add --get option to media volume to fetch the specified
stream volume and output it on the console.
Also displays the min and max volume for that stream.

Bug: 33559057
Test: adb shell media volume --stream 3 --get
Change-Id: Icc82ba1349dd75e07ccff4872e104843a69e5f17

7 years agoRevert "Settings recovery support"
Fyodor Kupolov [Wed, 21 Dec 2016 17:54:31 +0000 (17:54 +0000)]
Revert "Settings recovery support"

This reverts commit aa31697424064f823019c068d66fac704e5a2fc1.

Fixes: 33799277
Change-Id: I438e97c6a81512c673f20f6a01d3b9715c2dbf8a

7 years agoFinish up API for missing content:// flags.
Jeff Sharkey [Wed, 21 Dec 2016 17:48:42 +0000 (10:48 -0700)]
Finish up API for missing content:// flags.

Feature is already built under the hood, but it needs it's own public
StrictMode API so it can be independently enabled.

Test: builds, boots
Bug: 32447617
Change-Id: I3c0c6d62dd36aaf25f30e0ef8e0e7b40cf32c6d2

7 years agoRelax protected broadcast checks for shell.
Jeff Sharkey [Wed, 21 Dec 2016 16:56:00 +0000 (09:56 -0700)]
Relax protected broadcast checks for shell.

On userdebug/eng devices, the shell can run as non-shell UIDs, so
define a flag to identify broadcasts coming from the shell, and
don't yell if they're non-protected.

Test: builds, boots, root shell can send broadcasts
Bug: 32369665
Change-Id: I5f55930ee434cb8318c86aaf05eba3c59a326694

7 years agoMerge "Don't automatically remove autogroup summaries"
Julia Reynolds [Wed, 21 Dec 2016 16:28:02 +0000 (16:28 +0000)]
Merge "Don't automatically remove autogroup summaries"

7 years agoMerge "Expose hidden constant."
Julia Reynolds [Wed, 21 Dec 2016 16:17:18 +0000 (16:17 +0000)]
Merge "Expose hidden constant."

7 years agoMerge "Revert "Fast-path for ViewGroup#invalidateChild, invalidate tests""
Selim Cinek [Wed, 21 Dec 2016 15:57:35 +0000 (15:57 +0000)]
Merge "Revert "Fast-path for ViewGroup#invalidateChild, invalidate tests""

7 years agoRevert "Fast-path for ViewGroup#invalidateChild, invalidate tests"
Selim Cinek [Wed, 21 Dec 2016 15:34:30 +0000 (15:34 +0000)]
Revert "Fast-path for ViewGroup#invalidateChild, invalidate tests"

This reverts commit f7505803eaf3b31bae81151535ce6c05c58712be.

Change-Id: Ie7714360357e2baaf7723b8d992b3c6c4b0b9989

7 years agoMerge "Record data about dex files use on disk"
Calin Juravle [Wed, 21 Dec 2016 13:34:16 +0000 (13:34 +0000)]
Merge "Record data about dex files use on disk"

7 years agoMerge changes Ic88e8094,I4253bf4b,Iba4ebd3c,I943b6352,If88c0b08, ...
Selim Cinek [Wed, 21 Dec 2016 12:23:01 +0000 (12:23 +0000)]
Merge changes Ic88e8094,I4253bf4b,Iba4ebd3c,I943b6352,If88c0b08, ...

* changes:
  Made it easier to use updatable Animators
  Improved the interpolators of the icon appearing
  Modified the way icons merge into the shelf
  Fixed a potential heads up crash
  Fixed a bug where the notifications would close on back
  Bye bye veto button
  Only requiring 2 taps for accessibility on lock screen
  Fixed a bug where systemui could crash
  Introduced the visual stability manager
  Removing notifications always immediately when swiping them away

7 years agoMade it easier to use updatable Animators
Selim Cinek [Tue, 20 Dec 2016 13:32:19 +0000 (14:32 +0100)]
Made it easier to use updatable Animators

The existing system is extended such that AnimationProperties
can be easier animated and running animations updated.

As a first sample this animates the scale of the
icons in the shelf.

Change-Id: Ic88e8094d53f37ab13f5e9e00796b63d229a5114
Test: runtest systemui
Bug: 32437839

7 years agoImproved the interpolators of the icon appearing
Selim Cinek [Tue, 20 Dec 2016 12:17:03 +0000 (13:17 +0100)]
Improved the interpolators of the icon appearing

The interpolator has now a slight overshoot to it again.

Change-Id: I4253bf4b2cf9d471e3aa8c9483c9bcb88c2b3032
Test: add notifications, observe icon movement
Bug: 32437839

7 years agoMerge "Add logic for recording dex files use on disk"
Calin Juravle [Wed, 21 Dec 2016 11:03:07 +0000 (11:03 +0000)]
Merge "Add logic for recording dex files use on disk"

7 years agoModified the way icons merge into the shelf
Selim Cinek [Thu, 15 Dec 2016 00:31:40 +0000 (16:31 -0800)]
Modified the way icons merge into the shelf

The icon can now also move into the shelf in an animated
way instead of just moving out of it.

Change-Id: Iba4ebd3cd48b5299b89bd0cb2b05bd318e352173
Fixes: 33463805
Test: add notification observe behavior when scrolling

7 years agoFixed a potential heads up crash
Selim Cinek [Sat, 17 Dec 2016 00:56:41 +0000 (16:56 -0800)]
Fixed a potential heads up crash

If a group became suppressed with a summary that is
heads-upped, while also being in the process of being
removed, it could lead to a crash.

Test: isolate a HUN that was being removed and is a child
Change-Id: I943b63529778a3c85b03da033837f5a677b2d352
Fixes: 33645653

7 years agoFixed a bug where the notifications would close on back
Selim Cinek [Thu, 15 Dec 2016 22:14:29 +0000 (14:14 -0800)]
Fixed a bug where the notifications would close on back

When the panel collapsing was aborted or couldn't close
because we were tracking, then the panel wouldn't be
focusable anymore so it wouldn't handle the back pressed
for example.

Change-Id: If88c0b08301dccf8c2dcd79df5239e12fc83cce5
Test: click back while expanding, click back again when expanding finished, observe collapsing.
Fixes: 33260393

7 years agoBye bye veto button
Selim Cinek [Wed, 14 Dec 2016 22:41:01 +0000 (14:41 -0800)]
Bye bye veto button

You were just overruled by the congress
of usefulness.
In other bad joke news: this also fixes a bug
where it was focusable.

Test: dismiss notification, observe it working
Change-Id: I6d170563d0c4371066ce7b149bc40053e41ca5e2
Fixes: 32127661

7 years agoOnly requiring 2 taps for accessibility on lock screen
Selim Cinek [Wed, 14 Dec 2016 00:06:02 +0000 (16:06 -0800)]
Only requiring 2 taps for accessibility on lock screen

On the lock screen we were requiring two double taps
in order to unlock to a notification, which seems excessive
especially since talkback do their own falsing already.

Test: add notification with talkback on, try double tap
Test: add notification without talkback, existing logic still works
Bug: 32945599
Change-Id: I07e0e4299140644f62d311d8db25ec25ff138fde

7 years agoMerge "CEC: Dump recent message history for better logging"
TreeHugger Robot [Wed, 21 Dec 2016 07:37:28 +0000 (07:37 +0000)]
Merge "CEC: Dump recent message history for better logging"

7 years agoturn off warning that proto generated code causes.
Joe Onorato [Tue, 20 Dec 2016 20:29:48 +0000 (12:29 -0800)]
turn off warning that proto generated code causes.

Test: make
Change-Id: Ife3006dc16691dd95a2cc3d36c9b8832970601c9

7 years agoFix varargs bug that made incident_report print incorrectly.
Joe Onorato [Tue, 20 Dec 2016 16:21:38 +0000 (08:21 -0800)]
Fix varargs bug that made incident_report print incorrectly.

Test: incident_report 3000
Change-Id: I397677ecd6e50ad143518416c8fa3e408139189b

7 years agoClean up file names for protos
Joe Onorato [Tue, 20 Dec 2016 16:18:32 +0000 (08:18 -0800)]
Clean up file names for protos

Test: cts-tradefed run singleCommand cts -d --module CtsIncidentHostTestCases
Change-Id: Iea2fc81768082e8e01afa8df86e113665020e7f6

7 years agoMerge "DO NOT MERGE - Delete the separate grid recents activity and related code...
Manu Cornet [Wed, 21 Dec 2016 03:43:56 +0000 (03:43 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev
am: 09c0fdca7b

Change-Id: Iee06fca34f0b8fed136be45a93359414a5420734

7 years agoDO NOT MERGE - Delete the separate grid recents activity and related code
Manu Cornet [Wed, 21 Dec 2016 03:43:49 +0000 (03:43 +0000)]
DO NOT MERGE - Delete the separate grid recents activity and related code
am: e93f8100a6

Change-Id: I30195b094fe27bec5b78f799942bf004000d9ef2

7 years agoMerge "DO NOT MERGE - Delete the separate grid recents activity and related code...
TreeHugger Robot [Wed, 21 Dec 2016 03:35:41 +0000 (03:35 +0000)]
Merge "DO NOT MERGE - Delete the separate grid recents activity and related code" into nyc-mr2-dev

7 years agoMerge changes from topic 'diskstats-mr2' into nyc-mr2-dev
Daniel Nishi [Wed, 21 Dec 2016 02:28:55 +0000 (02:28 +0000)]
Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev
am: 639f95dd13

Change-Id: I3491a1ef5303e8e991eafe3911c882d94d4d3ed5

7 years agoAugment diskstats dumpsys to have categorization and apps.
Daniel Nishi [Wed, 21 Dec 2016 02:23:50 +0000 (02:23 +0000)]
Augment diskstats dumpsys to have categorization and apps.
am: 090b2d9d6c

Change-Id: I2c923293a1baf91b14ab50e25c880bfeb191403d

7 years agoAdd a file collector to the platform.
Daniel Nishi [Wed, 21 Dec 2016 02:23:05 +0000 (02:23 +0000)]
Add a file collector to the platform.
am: be770dce08

Change-Id: I2b908b6df1ad305207fca596d6c865dfeaecd5c9

7 years agoMerge "Add an app size collector." into nyc-mr2-dev
Daniel Nishi [Wed, 21 Dec 2016 02:22:18 +0000 (02:22 +0000)]
Merge "Add an app size collector." into nyc-mr2-dev
am: 8fd55702b1

Change-Id: I53fd6c70e49fd724fbe131dea3f485893133bf20

7 years agoAdd an app size collector.
Daniel Nishi [Wed, 21 Dec 2016 02:21:31 +0000 (02:21 +0000)]
Add an app size collector.
am: c7d9de59bf

Change-Id: I83bdc3b47eda2658d7467b7c298652e39ad3f238

7 years agoMerge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2 am: 4dfe2...
Tim Murray [Wed, 21 Dec 2016 02:14:57 +0000 (02:14 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2 am: 4dfe21d668
am: 5ff379db34

Change-Id: I8d51249b04b67f45b0f7cbbf25accc66155ae00a

7 years agoMerge changes from topic 'diskstats-mr2' into nyc-mr2-dev
TreeHugger Robot [Wed, 21 Dec 2016 02:14:51 +0000 (02:14 +0000)]
Merge changes from topic 'diskstats-mr2' into nyc-mr2-dev

* changes:
  Augment diskstats dumpsys to have categorization and apps.
  Add a file collector to the platform.

7 years agoMerge "Add an app size collector." into nyc-mr2-dev
TreeHugger Robot [Wed, 21 Dec 2016 02:14:51 +0000 (02:14 +0000)]
Merge "Add an app size collector." into nyc-mr2-dev

7 years agoMerge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2
Tim Murray [Wed, 21 Dec 2016 02:10:23 +0000 (02:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2
am: 4dfe21d668

Change-Id: I3840f68322659336d6737747dd86abcca48fa639

7 years agoMerge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a
Tim Murray [Wed, 21 Dec 2016 02:05:58 +0000 (02:05 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a
am: a72f5f27d2

Change-Id: I172251111ab333e750bc862725a50b7913f20c90

7 years agoMerge "Fix incorrect FIFO cgroup assignment."
Tim Murray [Wed, 21 Dec 2016 01:57:51 +0000 (01:57 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."
am: d9ce420d9a

Change-Id: Ib5c5ee81058ded098d16dba1dfd43096bbd91937

7 years agoDO NOT MERGE - Delete the separate grid recents activity and related code
Manu Cornet [Tue, 20 Dec 2016 17:33:45 +0000 (09:33 -0800)]
DO NOT MERGE - Delete the separate grid recents activity and related code

This was the first attempt at implementing grid-based Recents.
The new implementation doesn't use a separate activity and reuses a lot
more code.

Bug: 32101881
Test: Checked Recents behavior on local sw600dp device
Change-Id: Ic3535fc49f3f5448d6002d354678b633f122f57d

7 years agoMerge "Fix incorrect FIFO cgroup assignment."
Treehugger Robot [Wed, 21 Dec 2016 01:47:55 +0000 (01:47 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key" into nyc...
Brad Ebinger [Wed, 21 Dec 2016 01:40:37 +0000 (01:40 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev am: 5153e46897
am: 6c7f5eb29e  -s ours

Change-Id: If00328b9e775ba16253daff513d921c9cbbddb94

7 years agoAdds custom call forwarding block while roaming carrier config key am: eab25ae197
Brad Ebinger [Wed, 21 Dec 2016 01:39:20 +0000 (01:39 +0000)]
Adds custom call forwarding block while roaming carrier config key am: eab25ae197
am: f979b94815  -s ours

Change-Id: Ic542f2528198c3e1e39c816ee5f044571666d73f

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key" into nyc...
Brad Ebinger [Wed, 21 Dec 2016 01:34:25 +0000 (01:34 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev
am: 5153e46897

Change-Id: I1476d383602745c0e11de916c85618e2640eb24e

7 years agoAdds custom call forwarding block while roaming carrier config key
Brad Ebinger [Wed, 21 Dec 2016 01:34:11 +0000 (01:34 +0000)]
Adds custom call forwarding block while roaming carrier config key
am: eab25ae197

Change-Id: Ic638971c4bae7b496e94431ae2c0f35a22261896

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key" into nyc...
Brad Ebinger [Wed, 21 Dec 2016 01:29:07 +0000 (01:29 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8...
Amin Shaikh [Wed, 21 Dec 2016 01:24:53 +0000 (01:24 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8 am: 18d7a5e95f
am: ddf90dacd4

Change-Id: I8ea23e591cfd690ebbe9fcab463ffc0429ac3eec

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8
Amin Shaikh [Wed, 21 Dec 2016 01:19:48 +0000 (01:19 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8
am: 18d7a5e95f

Change-Id: I9e0240a30524436d13c60c3a1251064012c6f7bb

7 years agoMerge "Update account visibility API."
TreeHugger Robot [Wed, 21 Dec 2016 01:17:59 +0000 (01:17 +0000)]
Merge "Update account visibility API."

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392
Amin Shaikh [Wed, 21 Dec 2016 01:15:18 +0000 (01:15 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392
am: 380341f6c8

Change-Id: If863fcce014adf2b2c0d866dc14ba59732f57520

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF."
Amin Shaikh [Wed, 21 Dec 2016 01:10:44 +0000 (01:10 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
am: c1940ef392

Change-Id: If3d909680cbcda0440807db40761c1a84b2cde97

7 years agoMerge "Clear and restore the calling ID."
TreeHugger Robot [Wed, 21 Dec 2016 01:03:06 +0000 (01:03 +0000)]
Merge "Clear and restore the calling ID."

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f7...
Sundeep Ghuman [Wed, 21 Dec 2016 01:01:20 +0000 (01:01 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489 am: c5443c1d5c
am: 2d68d1a13c

Change-Id: I118293afd44dd619c0c039d4aef9c2f22bda338c

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF."
Treehugger Robot [Wed, 21 Dec 2016 01:00:18 +0000 (01:00 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f7...
Sundeep Ghuman [Wed, 21 Dec 2016 00:56:48 +0000 (00:56 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489
am: c5443c1d5c

Change-Id: Icbe6a2c873cdbe795092589430b15f10545a3cc2

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab
Sundeep Ghuman [Wed, 21 Dec 2016 00:51:49 +0000 (00:51 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab
am: 6d749fb489

Change-Id: I711dd2b9d142a3a92ed641b08dd944be329e503a

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache."
Sundeep Ghuman [Wed, 21 Dec 2016 00:43:15 +0000 (00:43 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
am: 31a8f712ab

Change-Id: Iba52c9ed85a7e35c46b85a9516a81ac5096a6710

7 years agoMerge "Fast-path for ViewGroup#invalidateChild, invalidate tests"
TreeHugger Robot [Wed, 21 Dec 2016 00:34:00 +0000 (00:34 +0000)]
Merge "Fast-path for ViewGroup#invalidateChild, invalidate tests"

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache."
Treehugger Robot [Wed, 21 Dec 2016 00:28:47 +0000 (00:28 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."

7 years agoUpdate account visibility API.
Dmitry Dementyev [Fri, 2 Dec 2016 18:27:45 +0000 (10:27 -0800)]
Update account visibility API.

Remove no longer used functions and in-memory visibility table.
Add stubs for new methods.
Actual implementation will be added in follow up CLs.
Bug: https://b.corp.google.com/issues/33046496
Test: manual tests, cts tests.

Change-Id: I990759b20c57df70bc944e27b84e59b9f77b9bd4

7 years agoClear and restore the calling ID.
Jeremy Joslin [Tue, 20 Dec 2016 22:36:20 +0000 (14:36 -0800)]
Clear and restore the calling ID.

Clear and restore the calling identity in IPC methods after asserting
the caller has the required permissions.

Fixed 2 tests in NetworkScoreServiceTest that were failing due to a
recent refactor.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33781319
Change-Id: Icd79751d12dcfe4af8026980aaa1f7bd463468dc

7 years agoMerge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
Marie Janssen [Tue, 20 Dec 2016 23:43:28 +0000 (23:43 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
am: eac9538c5c

Change-Id: I2eb357a770e8495c989caf0b092adc754b436d9c

7 years agoBluetooth: persist state when turning on from BLE am: fa9bec95a5
Marie Janssen [Tue, 20 Dec 2016 23:42:29 +0000 (23:42 +0000)]
Bluetooth: persist state when turning on from BLE am: fa9bec95a5
am: e7f0fd1d36

Change-Id: I9ba028b7e0b7c366227b20ae36c8ad76fbe3f9d2

7 years agoMerge "Add flags to send package name for feedback." into nyc-mr2-dev am: 72df83d117
Andrew Sapperstein [Tue, 20 Dec 2016 23:39:52 +0000 (23:39 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev am: 72df83d117
am: 8392637afd

Change-Id: I2fe1e1de687e6e02bab504773f812e1545b85784

7 years agoMerge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
Marie Janssen [Tue, 20 Dec 2016 23:38:31 +0000 (23:38 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
am: f77ca5fa18

Change-Id: Iee9a1e57f9b6ad0262fa5cedf1fc0daaf9c2fc00

7 years agoBluetooth: persist state when turning on from BLE
Marie Janssen [Tue, 20 Dec 2016 23:38:26 +0000 (23:38 +0000)]
Bluetooth: persist state when turning on from BLE
am: fa9bec95a5

Change-Id: I7fa40c657100032e400af8422b29941771b0e91a

7 years agoresolve merge conflicts of 4e10b37 to master
Andrew Sapperstein [Tue, 20 Dec 2016 23:31:32 +0000 (15:31 -0800)]
resolve merge conflicts of 4e10b37 to master

Change-Id: If5091133617285fdb7f3c0312e9e229ae8e53fe0

7 years agoMerge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 23:29:35 +0000 (23:29 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev

7 years agoChange fillColor for Wi-Fi badges to #FFFFFF.
Amin Shaikh [Tue, 20 Dec 2016 23:28:34 +0000 (15:28 -0800)]
Change fillColor for Wi-Fi badges to #FFFFFF.

Bug: 33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53

7 years agoCreate and implement a CacheListener inside WifiNetworkScoreCache.
Sundeep Ghuman [Tue, 13 Dec 2016 02:05:10 +0000 (18:05 -0800)]
Create and implement a CacheListener inside WifiNetworkScoreCache.

Bug: 33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38

7 years agoMerge "Add flags to send package name for feedback." into nyc-mr2-dev
Andrew Sapperstein [Tue, 20 Dec 2016 23:03:54 +0000 (23:03 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev
am: 72df83d117

Change-Id: I8a4bba81f402372035eaf37bd5d6489f042b52b9

7 years agoAdd flags to send package name for feedback.
Andrew Sapperstein [Tue, 20 Dec 2016 23:03:26 +0000 (23:03 +0000)]
Add flags to send package name for feedback.
am: 8dc3b870a0

Change-Id: I72a213a36de7459850e3f688569c901c192dcf9a

7 years agoMerge "Add flags to send package name for feedback." into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 22:57:16 +0000 (22:57 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5...
Amin Shaikh [Tue, 20 Dec 2016 22:52:43 +0000 (22:52 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5 am: 9209505c85
am: 6a7dbcb63c  -s ours

Change-Id: Ibce63d4610d53e0b0f11267fd805a96dd84c1e8b

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5
Amin Shaikh [Tue, 20 Dec 2016 22:48:15 +0000 (22:48 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5
am: 9209505c85

Change-Id: I4584fa5909f60fa21dec2014c90b3d7dc49a13a9

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd
Amin Shaikh [Tue, 20 Dec 2016 22:39:41 +0000 (22:39 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd
am: a81a4163f5

Change-Id: I847b3d07024e025040304f47de88211956d20175

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi"
Amin Shaikh [Tue, 20 Dec 2016 22:35:06 +0000 (22:35 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am: f456ddf3fd

Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32

7 years agoAdds custom call forwarding block while roaming carrier config key
Brad Ebinger [Mon, 12 Dec 2016 22:57:37 +0000 (14:57 -0800)]
Adds custom call forwarding block while roaming carrier config key

Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.

Test: Manual
Bug: 30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177

7 years agoMerge "Expose ScanResult#untrusted as a @SystemApi."
TreeHugger Robot [Tue, 20 Dec 2016 22:30:31 +0000 (22:30 +0000)]
Merge "Expose ScanResult#untrusted as a @SystemApi."

7 years agoMerge "Settings recovery support"
TreeHugger Robot [Tue, 20 Dec 2016 22:28:47 +0000 (22:28 +0000)]
Merge "Settings recovery support"

7 years agoMerge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev am: a03c3e74a4
Tim Murray [Tue, 20 Dec 2016 22:27:23 +0000 (22:27 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev am: a03c3e74a4
am: a6b0ad5821

Change-Id: I7d9cee78b586a9828a0764b93c64e462c3142aae

7 years agoFix incorrect FIFO cgroup assignment. am: 2dc4a74806
Tim Murray [Tue, 20 Dec 2016 22:26:16 +0000 (22:26 +0000)]
Fix incorrect FIFO cgroup assignment. am: 2dc4a74806
am: 220286ef0e

Change-Id: If626ffda197e73ed162535805445bed2a9ebfc87

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi"
Treehugger Robot [Tue, 20 Dec 2016 22:24:13 +0000 (22:24 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"

7 years agoMerge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
Tim Murray [Tue, 20 Dec 2016 22:17:35 +0000 (22:17 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
am: a03c3e74a4

Change-Id: I3f5633da996140cf88d85e5f997d9e41d48dec45

7 years agoFix incorrect FIFO cgroup assignment.
Tim Murray [Tue, 20 Dec 2016 22:17:29 +0000 (22:17 +0000)]
Fix incorrect FIFO cgroup assignment.
am: 2dc4a74806

Change-Id: I21f7c8a27bf5ee162d7b4567b408ab11eed30ae0

7 years agoMerge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 22:10:00 +0000 (22:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev