OSDN Git Service

android-x86/frameworks-base.git
9 years agoClean up Hyphenator file reading
Raph Levien [Mon, 6 Jul 2015 16:01:36 +0000 (09:01 -0700)]
Clean up Hyphenator file reading

The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:58:49 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:56:00 +0000 (08:56 -0500)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:51:48 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:50:33 +0000 (08:50 -0500)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 6 Jul 2015 13:48:34 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:47:43 +0000 (08:47 -0500)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 13:43:33 +0000 (08:43 -0500)]
Import translations. DO NOT MERGE

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

9 years agoFix two parsing bugs in new DHCP client.
Lorenzo Colitti [Mon, 6 Jul 2015 03:29:43 +0000 (12:29 +0900)]
Fix two parsing bugs in new DHCP client.

1. We don't parse PAD options properly, leading in failure to
   parse packets sent by DHCP servers that put the end of options
   marker after pad options and at an odd offset.
2. We get the DhcpResults vendorInfo from the wrong option type
   (60 instead of 43).

Fix these and add unit tests for the offer packets sent by a few
different DHCP servers.

Bug: 21955617
Bug: 22281295
Change-Id: I5d13f1a6a3ff0b53112f18f3db8792fa32ad2da3

9 years agoMerge "Fixing log typo. s/realted/related" into mnc-dev
Ian Pedowitz [Sun, 5 Jul 2015 01:13:43 +0000 (01:13 +0000)]
Merge "Fixing log typo.  s/realted/related" into mnc-dev

9 years agoFixing log typo. s/realted/related
Ian Pedowitz [Sun, 5 Jul 2015 01:07:33 +0000 (18:07 -0700)]
Fixing log typo.  s/realted/related

Bug: 22273408
Change-Id: I756f56ee80d5840bd734249826eb658cbf472921

9 years agoFix app ops aidl as it is also used from native.
Svet Ganov [Fri, 3 Jul 2015 23:22:26 +0000 (16:22 -0700)]
Fix app ops aidl as it is also used from native.

bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6

9 years agoMerge "KeyChain: annotate with @WorkerThread" into mnc-dev
Robin Lee [Fri, 3 Jul 2015 16:48:11 +0000 (16:48 +0000)]
Merge "KeyChain: annotate with @WorkerThread" into mnc-dev

9 years agoMerge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev
Lorenzo Colitti [Fri, 3 Jul 2015 02:37:41 +0000 (02:37 +0000)]
Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev

9 years agoMerge "Grant the default gallery app storage permissions" into mnc-dev
Svet Ganov [Thu, 2 Jul 2015 21:37:54 +0000 (21:37 +0000)]
Merge "Grant the default gallery app storage permissions" into mnc-dev

9 years agoMerge "Make granting default SMS and Phone permissions robust" into mnc-dev
Svetoslav [Thu, 2 Jul 2015 21:37:30 +0000 (21:37 +0000)]
Merge "Make granting default SMS and Phone permissions robust" into mnc-dev

9 years agoMerge "Add capability to indicate a conference will never have children." into mnc-dev
Anthony Lee [Thu, 2 Jul 2015 18:33:48 +0000 (18:33 +0000)]
Merge "Add capability to indicate a conference will never have children." into mnc-dev

9 years agoMerge "Remove ExternalMediaFormatActivity" into mnc-dev
Rubin Xu [Thu, 2 Jul 2015 16:22:43 +0000 (16:22 +0000)]
Merge "Remove ExternalMediaFormatActivity" into mnc-dev

9 years agoRemove ExternalMediaFormatActivity
Rubin Xu [Wed, 1 Jul 2015 17:07:46 +0000 (18:07 +0100)]
Remove ExternalMediaFormatActivity

This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2

9 years agoMerge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev
Alex Chau [Thu, 2 Jul 2015 14:37:01 +0000 (14:37 +0000)]
Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev

9 years agoMerge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev
Nicolas Prevot [Thu, 2 Jul 2015 12:28:42 +0000 (12:28 +0000)]
Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev

9 years agoMerge "Fix the case where an intent bounces several times between users." into mnc-dev
Nicolas Prevot [Thu, 2 Jul 2015 10:27:55 +0000 (10:27 +0000)]
Merge "Fix the case where an intent bounces several times between users." into mnc-dev

9 years agoMake the VPN notice connectivity changes on stacked interfaces.
Lorenzo Colitti [Thu, 2 Jul 2015 04:03:03 +0000 (13:03 +0900)]
Make the VPN notice connectivity changes on stacked interfaces.

Currently, the VPN code only looks at base interfaces, so if
464xlat is in use, it will never disconnect when its underlying
network has disconnected. Use getAllInterfaceNames().contains()
instead of just comparing the base interface name.

Bug: 19336810
Change-Id: Id1ba2c80a09cec5098c6f512acdc0a05a939e9f3

9 years agoGrant the default gallery app storage permissions
Svet Ganov [Thu, 2 Jul 2015 03:46:02 +0000 (20:46 -0700)]
Grant the default gallery app storage permissions

bug:22127986

Change-Id: I1ecd49d57d410bf10734fea4e0c92e6e5028d648

9 years agoMake granting default SMS and Phone permissions robust
Svetoslav [Thu, 2 Jul 2015 02:49:58 +0000 (19:49 -0700)]
Make granting default SMS and Phone permissions robust

The default dialer and sms apps are provided by the telecomm
stak which is brought up asynchronously as a service to which
the system binds. Hence, by the time we grant default permissions
this service is not bound and we do not know the default dialer
(accidentally the default SMS app is available before the service
is up). Now the default permission grant code is robust to handle
both cases of the default sms and phone apps being available
at grant time or asynchronously.

bug:22208642

Change-Id: I6385a0432368731aa9caea046d57eccbfb5abac0

9 years agoam 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug:...
David Friedman [Thu, 2 Jul 2015 02:45:30 +0000 (02:45 +0000)]
am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

* commit '2ebfc3f78483842c789688da47b721f60b4149e4':
  Docs: Localization of Design pages on DAC. Bug: 20503708

9 years agoam 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chines...
David Friedman [Thu, 2 Jul 2015 02:45:24 +0000 (02:45 +0000)]
am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs

* commit '5adc6ba056de056f73ee484b859b45657da0c1fb':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs

9 years agoam fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into...
David Friedman [Thu, 2 Jul 2015 02:33:03 +0000 (02:33 +0000)]
am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

* commit 'fa8eb1e0d42e7b10447a285d9b2a583d367c3cad':
  Docs: Localization of Design pages on DAC. Bug: 20503708

9 years agoam 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding...
David Friedman [Thu, 2 Jul 2015 02:32:59 +0000 (02:32 +0000)]
am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs

* commit '7e4dc922d949c7aec0a2a813e9487067e47e4c51':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs

9 years agoMerge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev
Abodunrinwa Toki [Thu, 2 Jul 2015 02:29:32 +0000 (02:29 +0000)]
Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev

9 years agoMerge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview...
David Friedman [Thu, 2 Jul 2015 02:24:12 +0000 (02:24 +0000)]
Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs

9 years agoMerge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into...
David Friedman [Thu, 2 Jul 2015 02:23:53 +0000 (02:23 +0000)]
Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs

9 years agoDocs: Localization of Design pages on DAC.
David Friedman [Tue, 30 Jun 2015 20:09:48 +0000 (13:09 -0700)]
Docs: Localization of Design pages on DAC.
Bug: 20503708

Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c

9 years agoam b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am...
Wale Ogunwale [Thu, 2 Jul 2015 02:14:44 +0000 (02:14 +0000)]
am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'b85962df1ee6be2bba4c26fbd0964ade2c73a9c9':
  Prevent system uid component from running in an app process

9 years agoam e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:36:17 +0000 (01:36 +0000)]
am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'e155eef4881c1ec8063a62619fe29aa6e8074b71':
  Prevent system uid component from running in an app process

9 years agoam 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:22:06 +0000 (01:22 +0000)]
am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '2735ac71e6d8d1c00b95104057ac9365abb485d9':
  Prevent system uid component from running in an app process

9 years agoam 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:07:44 +0000 (01:07 +0000)]
am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '22cd16a01f55149507c1d5d71c408987a71737fc':
  Prevent system uid component from running in an app process

9 years agoam 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am...
Wale Ogunwale [Thu, 2 Jul 2015 01:00:02 +0000 (01:00 +0000)]
am 2adcfa1c: am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev

* commit '2adcfa1c02ecc695b86b8b11c1c4eb9891d4337e':
  Prevent system uid component from running in an app process

9 years agoam 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent syste...
Wale Ogunwale [Thu, 2 Jul 2015 00:59:56 +0000 (00:59 +0000)]
am 655b08c3: am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev

* commit '655b08c38a08d9adb35b75cf340d70068ba81204':
  Prevent system uid component from running in an app process

9 years agoam aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
Filip Gruszczynski [Thu, 2 Jul 2015 00:59:48 +0000 (00:59 +0000)]
am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.

* commit 'aabc9869a95928660271b7022e2756fff2654013':
  Handle outsets when resized is called due to rotation.

9 years agoam 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge...
Wale Ogunwale [Thu, 2 Jul 2015 00:52:35 +0000 (00:52 +0000)]
am 657d20ee: am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev

* commit '657d20ee575f75beeb6a8419e07f3cb3960423fa':
  Prevent system uid component from running in an app process

9 years agoam b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid compone...
Wale Ogunwale [Thu, 2 Jul 2015 00:52:29 +0000 (00:52 +0000)]
am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev

* commit 'b6f87997cb6ea557dc84e77c18c5bb22f99411fc':
  Prevent system uid component from running in an app process

9 years agoam bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge...
Wale Ogunwale [Thu, 2 Jul 2015 00:50:52 +0000 (00:50 +0000)]
am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'bc4743ebe845958fab8bbb0d0a425d55ece3d205':
  Prevent system uid component from running in an app process

9 years agoam 03850591: Handle outsets when resized is called due to rotation.
Filip Gruszczynski [Thu, 2 Jul 2015 00:47:48 +0000 (00:47 +0000)]
am 03850591: Handle outsets when resized is called due to rotation.

* commit '03850591954faf5280fd581dd04cd6958eda0124':
  Handle outsets when resized is called due to rotation.

9 years agoam 429b9afd: am 0de59080: Merge "Docs: Fixes metadata that was getting mangled in...
David Friedman [Thu, 2 Jul 2015 00:47:24 +0000 (00:47 +0000)]
am 429b9afd: am 0de59080: Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs

* commit '429b9afd8f1a6a230754cb8567927c3cf4843931':
  Docs: Fixes metadata that was getting mangled in jd_lists_unified file.

9 years agoam c5764868: am e562bb6b: Merge "Docs: Localizations of Android dev on-boarding train...
David Friedman [Thu, 2 Jul 2015 00:47:18 +0000 (00:47 +0000)]
am c5764868: am e562bb6b: Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs

* commit 'c5764868bdeef4a944317885b000db50e4092db5':
  Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574

9 years agoam 5320bccf: am 16add46c: Docs: Adding localized TOC for Preview docs.
David Friedman [Thu, 2 Jul 2015 00:47:12 +0000 (00:47 +0000)]
am 5320bccf: am 16add46c: Docs: Adding localized TOC for Preview docs.

* commit '5320bccfaba7861b4a2c18d2109575e6b4029a49':
  Docs: Adding localized TOC for Preview docs.

9 years agoam 0de59080: Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified...
David Friedman [Thu, 2 Jul 2015 00:37:26 +0000 (00:37 +0000)]
am 0de59080: Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs

* commit '0de590809590a144e4eeb1f36366109db7bcd89f':
  Docs: Fixes metadata that was getting mangled in jd_lists_unified file.

9 years agoam e562bb6b: Merge "Docs: Localizations of Android dev on-boarding training docs...
David Friedman [Thu, 2 Jul 2015 00:37:21 +0000 (00:37 +0000)]
am e562bb6b: Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs

* commit 'e562bb6bc8da9bbbc8415db040de2bc0dc166168':
  Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574

9 years agoam 16add46c: Docs: Adding localized TOC for Preview docs.
David Friedman [Thu, 2 Jul 2015 00:37:17 +0000 (00:37 +0000)]
am 16add46c: Docs: Adding localized TOC for Preview docs.

* commit '16add46c5c4575ae28af9ef421eee0a76b07fa77':
  Docs: Adding localized TOC for Preview docs.

9 years agoam 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent syste...
Wale Ogunwale [Thu, 2 Jul 2015 00:37:02 +0000 (00:37 +0000)]
am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '7ab264abc214b7e1b7fff9934814020cea5f18fa':
  Prevent system uid component from running in an app process

9 years agoam 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent syste...
Wale Ogunwale [Thu, 2 Jul 2015 00:35:51 +0000 (00:35 +0000)]
am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev

* commit '44000724ef630182579004939d0c064664d9d3f2':
  Prevent system uid component from running in an app process

9 years agoam f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from runni...
Wale Ogunwale [Thu, 2 Jul 2015 00:35:47 +0000 (00:35 +0000)]
am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev

* commit 'f54d17224bada1d852ba7c9d4bb9e2a792c0093b':
  Prevent system uid component from running in an app process

9 years agoam bf0fd65c: am 9131f97f: Merge "docs: Added warning to not use Android Key when...
Robert Schaub [Thu, 2 Jul 2015 00:13:00 +0000 (00:13 +0000)]
am bf0fd65c: am 9131f97f: Merge "docs: Added warning to not use Android Key when API key is required" into mnc-preview-docs

* commit 'bf0fd65ca0ba800f65aa9a70219abc3b37d5f6ec':
  docs: Added warning to not use Android Key when API key is required

9 years agoMerge "Better handling of trim/benchmark results." into mnc-dev
Jeff Sharkey [Thu, 2 Jul 2015 00:09:09 +0000 (00:09 +0000)]
Merge "Better handling of trim/benchmark results." into mnc-dev

9 years agoMerge "Merge commit '88c0af88' into mnc-dev..." into mnc-dev
Rich Slogar [Thu, 2 Jul 2015 00:03:54 +0000 (00:03 +0000)]
Merge "Merge commit '88c0af88' into mnc-dev..." into mnc-dev

9 years agoMerge commit '88c0af88' into mnc-dev...
Rich Slogar [Wed, 1 Jul 2015 23:59:38 +0000 (16:59 -0700)]
Merge commit '88c0af88' into mnc-dev...

Change-Id: Ib5a797e9a54ab1d447d84a57a209b32c4839b8c3

9 years agoMerge "Teach receivers, activities, providers, and services app ops." into mnc-dev
Svet Ganov [Wed, 1 Jul 2015 23:59:17 +0000 (23:59 +0000)]
Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev

9 years agoMerge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev
Svet Ganov [Wed, 1 Jul 2015 23:58:44 +0000 (23:58 +0000)]
Merge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev

9 years agoDocs: Fixes a terminology error in simplified Chinese on-boarding docs
David Friedman [Wed, 1 Jul 2015 23:52:37 +0000 (16:52 -0700)]
Docs: Fixes a terminology error in simplified Chinese on-boarding docs

Change-Id: Ib0ba3d449e78a0a69c0f704399b3865380bfcc8f

9 years agoMerge "Set go-faster arguments" into mnc-dev
John Reck [Wed, 1 Jul 2015 23:52:17 +0000 (23:52 +0000)]
Merge "Set go-faster arguments" into mnc-dev

9 years agoTeach receivers, activities, providers, and services app ops.
Svet Ganov [Sat, 27 Jun 2015 20:15:22 +0000 (13:15 -0700)]
Teach receivers, activities, providers, and services app ops.

Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2

9 years agoBetter handling of trim/benchmark results.
Jeff Sharkey [Sat, 27 Jun 2015 22:43:45 +0000 (15:43 -0700)]
Better handling of trim/benchmark results.

Request benchmarking of devices once per week during normal fstrim
maintenance window.  Tunable parameter gives us the ability to change
frequency through global setting.

Track individual benchmark and trim results for each volume, and
use scrubbed volume identifier (based on adoptiong age) when logging
stats to drop box.  Track last benchmark and trim time for each
volume separately.

Bug: 21831325
Change-Id: I53b3ed788f7820c2e5bceb2840339f5b4aada3f0

9 years agoMerge "Fix: Selection handles can remain on home screen." into mnc-dev
Keisuke Kuroyanagi [Wed, 1 Jul 2015 22:44:48 +0000 (22:44 +0000)]
Merge "Fix: Selection handles can remain on home screen." into mnc-dev

9 years agoMerge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev
Dianne Hackborn [Wed, 1 Jul 2015 22:33:30 +0000 (22:33 +0000)]
Merge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev

9 years agoMerge "Fix issue #20672970: Notifications are not dismissed on hot word detection...
Dianne Hackborn [Wed, 1 Jul 2015 22:31:15 +0000 (22:31 +0000)]
Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev

9 years agoMerge "Trust: Track separate user has authenticated since boot" into mnc-dev
Adrian Roos [Wed, 1 Jul 2015 22:30:48 +0000 (22:30 +0000)]
Merge "Trust: Track separate user has authenticated since boot" into mnc-dev

9 years agoMerge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..."...
Dianne Hackborn [Wed, 1 Jul 2015 22:19:44 +0000 (22:19 +0000)]
Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev

9 years agoDevice idle fixes: issue #22209630 and issue #22225665
Dianne Hackborn [Wed, 1 Jul 2015 22:05:04 +0000 (15:05 -0700)]
Device idle fixes: issue #22209630 and issue #22225665

Issue #22209630: Only allow whitelisted apps to put apps on the temp whitelist

We now check whether the calling app is a system uid or in the whitelist
and, if not, throw an exception.

Issue #22225665: Alarm still goes off in idle mode (doze)

Fix a bug where we were not clearing the calling identity when coming
through the dump command to the service, and as a result when we would
eventually call out to the alarm manager it wouldn't do what we want.
This was only broken when being controlled by the shell.

Also adjust the network policy manager service's handling of device
idle transitions to only toggle the device idle state, which gets rid
of the long delay we have coming out of idle mode.  And add in a bit
of logging around going in/out of idle mode to try to understand where
things may be slow in the future.

Change-Id: I4a41f790e9b0bb31330314b94111557d479f2ba5

9 years agoMerge "Fixed accessibility order for quick settings" into mnc-dev
Selim Cinek [Wed, 1 Jul 2015 22:03:30 +0000 (22:03 +0000)]
Merge "Fixed accessibility order for quick settings" into mnc-dev

9 years agoMerge "Clear default browser setting when a new browser app is installed" into mnc-dev
Christopher Tate [Wed, 1 Jul 2015 21:15:57 +0000 (21:15 +0000)]
Merge "Clear default browser setting when a new browser app is installed" into mnc-dev

9 years agoClear default browser setting when a new browser app is installed
Christopher Tate [Wed, 1 Jul 2015 21:00:40 +0000 (14:00 -0700)]
Clear default browser setting when a new browser app is installed

Even if you have explicitly named a default browser app, when you
add a new browser app to the system it now assumes that perhaps you
might want that to be the new default, so it puts you into the
explicit ambiguity state.

Also fix a bug in the factory-default-browser handling; it was not
examining the set of available browsers.

Bug 22120412

Change-Id: I183ed87a51be1e4aa65457f05b98e406bb7b495d

9 years agoMerge "Use std::sort instead of quickSortX" into mnc-dev
John Reck [Wed, 1 Jul 2015 20:54:45 +0000 (20:54 +0000)]
Merge "Use std::sort instead of quickSortX" into mnc-dev

9 years agoSet go-faster arguments
John Reck [Wed, 1 Jul 2015 20:51:44 +0000 (13:51 -0700)]
Set go-faster arguments

Bug: 22208220

Increases performance of shadows by yet another
15% by using more aggressive math optimizations

Change-Id: Ie3fabeae3647632a19ff573bf6b2d7f7a7cef555

9 years agoMerge "camera2: Fix ABI for new tags." into mnc-dev
Ruben Brunk [Wed, 1 Jul 2015 20:51:13 +0000 (20:51 +0000)]
Merge "camera2: Fix ABI for new tags." into mnc-dev

9 years agoFix issue #20672970: Notifications are not dismissed on hot word detection
Dianne Hackborn [Wed, 1 Jul 2015 20:41:03 +0000 (13:41 -0700)]
Fix issue #20672970: Notifications are not dismissed on hot word detection

Add new VoiceInteractionSession.closeSystemDialogs() API that closes
everything except the session itself.

Change-Id: If45f1e120d8ca095b6c8055b6485acb5e710820e

9 years agoMerge "Use correct starting size for clip reveal transition" into mnc-dev
Jorim Jaggi [Wed, 1 Jul 2015 20:28:50 +0000 (20:28 +0000)]
Merge "Use correct starting size for clip reveal transition" into mnc-dev

9 years agoMerge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev
Carlos Valdivia [Wed, 1 Jul 2015 20:15:42 +0000 (20:15 +0000)]
Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev

9 years agoUse correct starting size for clip reveal transition
Jorim Jaggi [Wed, 1 Jul 2015 19:54:58 +0000 (12:54 -0700)]
Use correct starting size for clip reveal transition

Bug: 22174716
Change-Id: I807837d0c52f1e266204bb08391f8224dc3ff8c7

9 years agoMerge "correctly print wificonfiguration creation and update time" into mnc-dev
Vinit Deshpande [Wed, 1 Jul 2015 20:06:22 +0000 (20:06 +0000)]
Merge "correctly print wificonfiguration creation and update time" into mnc-dev

9 years agocamera2: Fix ABI for new tags.
Ruben Brunk [Wed, 1 Jul 2015 19:53:45 +0000 (12:53 -0700)]
camera2: Fix ABI for new tags.

Bug: 22229158
Change-Id: If8dc8524258b59b45e56ce54f451c59b9c7e79e2

9 years agocorrectly print wificonfiguration creation and update time
Pierre Vandwalle [Wed, 1 Jul 2015 19:48:26 +0000 (12:48 -0700)]
correctly print wificonfiguration creation and update time

Change-Id: I1c4abf9bed86cddea3592f0604def1a7727b73fc

9 years agoMerge "More API review feedback" into mnc-dev
Vinit Deshpande [Wed, 1 Jul 2015 19:46:48 +0000 (19:46 +0000)]
Merge "More API review feedback" into mnc-dev

9 years agoWorkaround legacy TelephonyManager.getDefault() with no context
Svet Ganov [Wed, 1 Jul 2015 19:38:44 +0000 (12:38 -0700)]
Workaround legacy TelephonyManager.getDefault() with no context

bug:22201450

Change-Id: If591bd90f3e4081c411dfa6415853c110a62a7fb

9 years agoWork on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
Dianne Hackborn [Wed, 1 Jul 2015 19:30:54 +0000 (12:30 -0700)]
Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...

...to an explicit toggle to enable in Settings

Add a new permission flag, saying the permission can be automatically
granted to pre-api-23 apps.  Apply this to SYSTEM_ALERT_WINDOW.

Change-Id: I24a0ceabe7e9f5e458a864d30eda2696ad14a699

9 years agoMerge "Grant permissions to headless system calendar/contacts sync adapters." into...
Svetoslav [Wed, 1 Jul 2015 19:26:12 +0000 (19:26 +0000)]
Merge "Grant permissions to headless system calendar/contacts sync adapters." into mnc-dev

9 years agoMerge "BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cpu...
Adam Lesinski [Wed, 1 Jul 2015 19:22:52 +0000 (19:22 +0000)]
Merge "BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev

9 years agoMerge "Clear binder identity when grantint permisisons to carrier apps" into mnc-dev
Svet Ganov [Wed, 1 Jul 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Clear binder identity when grantint permisisons to carrier apps" into mnc-dev

9 years agoBatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
Adam Lesinski [Wed, 1 Jul 2015 19:09:45 +0000 (12:09 -0700)]
BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime

Bug:22225706
Change-Id: I4c7d889716345231564c1e96494dc84aab17cf01

9 years agoAdd BluetoothService to reduce resuming time after reboot
Miao Chou [Sat, 27 Jun 2015 00:14:35 +0000 (17:14 -0700)]
Add BluetoothService to reduce resuming time after reboot

As a subclass of SystemService, BluetoothService wraps around
BluetoothManagerService to unlock Auto-enabling Bluetooth earlier by overriding
onBootPhase() and removes the need to wait for BOOT_COMPLETED message.

Bug:21705209
Change-Id: I2acc41370a750d8416e11e662e06392326741d2c

9 years agoMerge "Switch from fminf/fmaxf to std::min/max" into mnc-dev
Chris Craik [Wed, 1 Jul 2015 18:10:30 +0000 (18:10 +0000)]
Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev

9 years agoMerge "Allow default SMS app to get self phone number" into mnc-dev
Makoto Onuki [Wed, 1 Jul 2015 18:06:36 +0000 (18:06 +0000)]
Merge "Allow default SMS app to get self phone number" into mnc-dev

9 years agoMerge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev
Aravind Akella [Wed, 1 Jul 2015 18:04:40 +0000 (18:04 +0000)]
Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev

9 years agoMerge "Catch SecurityExceptions" into mnc-dev
Jay Shrauner [Wed, 1 Jul 2015 18:04:34 +0000 (18:04 +0000)]
Merge "Catch SecurityExceptions" into mnc-dev

9 years agoMerge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into...
David Friedman [Wed, 1 Jul 2015 17:58:44 +0000 (17:58 +0000)]
Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs

9 years agoMerge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574...
David Friedman [Wed, 1 Jul 2015 17:54:11 +0000 (17:54 +0000)]
Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 17:54:21 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam 48413e6a: am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview...
Rich Slogar [Wed, 1 Jul 2015 17:51:23 +0000 (17:51 +0000)]
am 48413e6a: am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs

* commit '48413e6a1134137c7358217c550b2783a7df3a03':
  docs: migration guide link update

9 years agoam 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw...
Filip Gruszczynski [Wed, 1 Jul 2015 17:51:18 +0000 (17:51 +0000)]
am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev

* commit '3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992':
  Build fix after changing IWindowSession.

9 years agoMerge "Changes to Data Injection mode APIs" into mnc-dev
Aravind Akella [Wed, 1 Jul 2015 17:39:54 +0000 (17:39 +0000)]
Merge "Changes to Data Injection mode APIs" into mnc-dev