OSDN Git Service

android-x86/frameworks-base.git
9 years agoam f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev
Keisuke Kuroyanagi [Thu, 2 Jul 2015 00:41:13 +0000 (00:41 +0000)]
am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev

* commit 'f3be3ddfd86c362f21948b8253bf8a88a710ed82':
  Fix: Selection handles can remain on home screen.

9 years agoam 36e52cdc: Merge "Device idle fixes: issue #22209630 and issue #22225665" into...
Dianne Hackborn [Thu, 2 Jul 2015 00:41:07 +0000 (00:41 +0000)]
am 36e52cdc: Merge "Device idle fixes: issue #22209630 and issue #22225665" into mnc-dev

* commit '36e52cdcd3bbcb2354db2735a6f3c87a6ca4a925':
  Device idle fixes: issue #22209630 and issue #22225665

9 years agoam 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word...
Dianne Hackborn [Thu, 2 Jul 2015 00:41:00 +0000 (00:41 +0000)]
am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev

* commit '6cc53743f5d37d7761a3bb924b380dd29d46e26d':
  Fix issue #20672970: Notifications are not dismissed on hot word detection

9 years agoam 47e9b148: Merge "Trust: Track separate user has authenticated since boot" into...
Adrian Roos [Thu, 2 Jul 2015 00:40:53 +0000 (00:40 +0000)]
am 47e9b148: Merge "Trust: Track separate user has authenticated since boot" into mnc-dev

* commit '47e9b1489d1d8da260f889df04805273c106091e':
  Trust: Track separate user has authenticated since boot

9 years agoam 76664d9d: Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WI...
Dianne Hackborn [Thu, 2 Jul 2015 00:40:47 +0000 (00:40 +0000)]
am 76664d9d: Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit '76664d9dcfbbe04c50a00ea1e268e80b9a9f6087':
  Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...

9 years agoam f22e2e39: Merge "Fixed accessibility order for quick settings" into mnc-dev
Selim Cinek [Thu, 2 Jul 2015 00:40:40 +0000 (00:40 +0000)]
am f22e2e39: Merge "Fixed accessibility order for quick settings" into mnc-dev

* commit 'f22e2e3998db9bcfdac5d1c524b0c02e7da7f86d':
  Fixed accessibility order for quick settings

9 years agoam 61d7acae: Merge "Clear default browser setting when a new browser app is installed...
Christopher Tate [Thu, 2 Jul 2015 00:40:33 +0000 (00:40 +0000)]
am 61d7acae: Merge "Clear default browser setting when a new browser app is installed" into mnc-dev

* commit '61d7acae0cafc265e94a35ad3ba1677f60346de9':
  Clear default browser setting when a new browser app is installed

9 years agoam d7580333: Merge "Use std::sort instead of quickSortX" into mnc-dev
John Reck [Thu, 2 Jul 2015 00:40:27 +0000 (00:40 +0000)]
am d7580333: Merge "Use std::sort instead of quickSortX" into mnc-dev

* commit 'd758033368595a65182367ca74d46f42472cb078':
  Use std::sort instead of quickSortX

9 years agoam e4ed4708: Merge "camera2: Fix ABI for new tags." into mnc-dev
Ruben Brunk [Thu, 2 Jul 2015 00:40:08 +0000 (00:40 +0000)]
am e4ed4708: Merge "camera2: Fix ABI for new tags." into mnc-dev

* commit 'e4ed47087f7efde64bc5764f21d007d0ce98da48':
  camera2: Fix ABI for new tags.

9 years agoam 1eecf470: Merge "Use correct starting size for clip reveal transition" into mnc-dev
Jorim Jaggi [Thu, 2 Jul 2015 00:39:56 +0000 (00:39 +0000)]
am 1eecf470: Merge "Use correct starting size for clip reveal transition" into mnc-dev

* commit '1eecf4701a90f2cdc1d51f895fba0998bb0b0b13':
  Use correct starting size for clip reveal transition

9 years agoam 88817de8: Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev
Carlos Valdivia [Thu, 2 Jul 2015 00:39:50 +0000 (00:39 +0000)]
am 88817de8: Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev

* commit '88817de840a9d0a910e16f41f54ea5464ede4c53':
  Tweak GET_ACCOUNTS behavior and improve memory.

9 years agoam dd14bad8: Merge "correctly print wificonfiguration creation and update time" into...
Vinit Deshpande [Thu, 2 Jul 2015 00:39:43 +0000 (00:39 +0000)]
am dd14bad8: Merge "correctly print wificonfiguration creation and update time" into mnc-dev

* commit 'dd14bad82d46c565de923daf74cd5fbc993f8537':
  correctly print wificonfiguration creation and update time

9 years agoam edc31579: Merge "More API review feedback" into mnc-dev
Vinit Deshpande [Thu, 2 Jul 2015 00:39:37 +0000 (00:39 +0000)]
am edc31579: Merge "More API review feedback" into mnc-dev

* commit 'edc3157948c9820998ac1aca33ced3e07bc249ff':
  More API review feedback

9 years agoam 29563632: Merge "Grant permissions to headless system calendar/contacts sync adapt...
Svetoslav [Thu, 2 Jul 2015 00:39:30 +0000 (00:39 +0000)]
am 29563632: Merge "Grant permissions to headless system calendar/contacts sync adapters." into mnc-dev

* commit '2956363244ecb61f48729d93b510ffadac591cae':
  Grant permissions to headless system calendar/contacts sync adapters.

9 years agoam 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field...
Adam Lesinski [Thu, 2 Jul 2015 00:39:22 +0000 (00:39 +0000)]
am 0fdd22a6: Merge "BatteryStats: Don\'t assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev

* commit '0fdd22a60241cc0c5e96f5783bf8c798fe7f8f8d':
  BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime

9 years agoam abbdc864: Merge "Clear binder identity when grantint permisisons to carrier apps...
Svet Ganov [Thu, 2 Jul 2015 00:39:15 +0000 (00:39 +0000)]
am abbdc864: Merge "Clear binder identity when grantint permisisons to carrier apps" into mnc-dev

* commit 'abbdc864f001b7e61bd1910fc435bc8ec04a6476':
  Clear binder identity when grantint permisisons to carrier apps

9 years agoam 658bf2fa: Add BluetoothService to reduce resuming time after reboot
Miao Chou [Thu, 2 Jul 2015 00:39:09 +0000 (00:39 +0000)]
am 658bf2fa: Add BluetoothService to reduce resuming time after reboot

* commit '658bf2fa6d3bb1121c3c96abb62ca01d3abe95db':
  Add BluetoothService to reduce resuming time after reboot

9 years agoam d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev
Chris Craik [Thu, 2 Jul 2015 00:38:59 +0000 (00:38 +0000)]
am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev

* commit 'd3ecb3e6f04a0f76c886238af6bef1d10b987a42':
  Switch from fminf/fmaxf to std::min/max

9 years agoam a10277e3: Merge "Allow default SMS app to get self phone number" into mnc-dev
Makoto Onuki [Thu, 2 Jul 2015 00:38:52 +0000 (00:38 +0000)]
am a10277e3: Merge "Allow default SMS app to get self phone number" into mnc-dev

* commit 'a10277e3e4c01e08f53b98eac3c98bf94482b106':
  Allow default SMS app to get self phone number

9 years agoam ef8d2bba: Merge "Fix for last sensor missing from sensor list returned by the...
Aravind Akella [Thu, 2 Jul 2015 00:38:47 +0000 (00:38 +0000)]
am ef8d2bba: Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev

* commit 'ef8d2bba23bd4f8d5ff02f821e447416115b0bde':
  Fix for last sensor missing from sensor list returned by the HAL.

9 years agoam b6045cb8: Merge "Catch SecurityExceptions" into mnc-dev
Jay Shrauner [Thu, 2 Jul 2015 00:38:41 +0000 (00:38 +0000)]
am b6045cb8: Merge "Catch SecurityExceptions" into mnc-dev

* commit 'b6045cb8e0e55db00f7938925d4b6767da1bb5b0':
  Catch SecurityExceptions

9 years agoam 1f9d5a09: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 2 Jul 2015 00:38:36 +0000 (00:38 +0000)]
am 1f9d5a09: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1f9d5a0950256403b4070bb890ec68342c2950b5':
  Import translations. DO NOT MERGE

9 years agoam b8388f34: am 48413e6a: am 761b4a7d: Merge "docs: migration guide link update"...
Rich Slogar [Thu, 2 Jul 2015 00:38:30 +0000 (00:38 +0000)]
am b8388f34: am 48413e6a: am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs

* commit 'b8388f345c0f2955ddcd0a564596cf56ba9f4c8d':
  docs: migration guide link update

9 years agoam 81f8cd92: am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession...
Filip Gruszczynski [Thu, 2 Jul 2015 00:38:22 +0000 (00:38 +0000)]
am 81f8cd92: am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev

* commit '81f8cd92fa003a8625df1098662d0afa50f07e89':
  Build fix after changing IWindowSession.

9 years agoam 32207e3c: Merge "Changes to Data Injection mode APIs" into mnc-dev
Aravind Akella [Thu, 2 Jul 2015 00:38:00 +0000 (00:38 +0000)]
am 32207e3c: Merge "Changes to Data Injection mode APIs" into mnc-dev

* commit '32207e3c66f9b7979a6d465b87eb531327916081':
  Changes to Data Injection mode APIs

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 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 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 "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 agoam 0794acc5: am a4ac253b: am ed053477: Merge "docs: Move scale Bitmap code to onSurfa...
Luan Nguyen [Wed, 1 Jul 2015 17:43:56 +0000 (17:43 +0000)]
am 0794acc5: am a4ac253b: am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs

* commit '0794acc557f52960e52b369c6e4e5bf0bc575d02':
  docs: Move scale Bitmap code to onSurfaceChanged

9 years agoam 4b2d7061: am 45e50f87: (-s ours) am 71699d76: am 95c47354: am 43d3bd02: am 8363104...
Amit Mahajan [Wed, 1 Jul 2015 17:43:49 +0000 (17:43 +0000)]
am 4b2d7061: am 45e50f87: (-s ours) am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '4b2d706155deb4f9940feaeb6f6d9a3abcdf208a':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

9 years agoam 3cc50169: am f1f720b6: am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am...
Joe Fernandez [Wed, 1 Jul 2015 17:43:42 +0000 (17:43 +0000)]
am 3cc50169: am f1f720b6: am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-

* commit '3cc50169fe81d5b6a38a0c2a4a256389caecd63f':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.

9 years agoam d88767da: am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into...
Rich Slogar [Wed, 1 Jul 2015 17:43:35 +0000 (17:43 +0000)]
am d88767da: am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs

* commit 'd88767da1e0eddb4467ff980764afab93db3c6e9':
  docs: studio workflow page typo

9 years agoam a5097999: am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code...
Robert Schaub [Wed, 1 Jul 2015 17:43:29 +0000 (17:43 +0000)]
am a5097999: am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs

* commit 'a50979997cd3f7a61b95f1c46cb8fddab234afe9':
  docs: Changed link in Java source code comment to repair 404

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Jul 2015 17:29:58 +0000 (12:29 -0500)]
Import translations. DO NOT MERGE

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

9 years agoam d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev
Filip Gruszczynski [Wed, 1 Jul 2015 17:13:59 +0000 (17:13 +0000)]
am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev

* commit 'd40c423b1cdccd61ed411b0b9e3fbefd47e99f9c':
  Calculate outset hint when adding window.

9 years agoam a4ac386d: Merge "Make querying the graphics stats service more defensive" into...
John Reck [Wed, 1 Jul 2015 17:13:54 +0000 (17:13 +0000)]
am a4ac386d: Merge "Make querying the graphics stats service more defensive" into mnc-dev

* commit 'a4ac386d2a5a29876d1df0b980fb713e6c3e047d':
  Make querying the graphics stats service more defensive

9 years agoam a4ac253b: am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged...
Luan Nguyen [Wed, 1 Jul 2015 17:13:03 +0000 (17:13 +0000)]
am a4ac253b: am ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs

* commit 'a4ac253bc36bbced5acad8a7ddf1838b11f6e44c':
  docs: Move scale Bitmap code to onSurfaceChanged

9 years agoam 45e50f87: (-s ours) am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e8...
Amit Mahajan [Wed, 1 Jul 2015 17:12:53 +0000 (17:12 +0000)]
am 45e50f87: (-s ours) am 71699d76: am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '45e50f87bb2b2cd11b19ee102223c03356d77042':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

9 years agoam f1f720b6: am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am...
Joe Fernandez [Wed, 1 Jul 2015 17:12:45 +0000 (17:12 +0000)]
am f1f720b6: am cbbbabaa: am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs

* commit 'f1f720b607ef6150f79095e2dd7ab1e62fc03c10':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.

9 years agoam e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview...
Rich Slogar [Wed, 1 Jul 2015 17:12:39 +0000 (17:12 +0000)]
am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs

* commit 'e3d8df63076241a3d3637643e6ff1530bca5a5b2':
  docs: studio workflow page typo

9 years agoam e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to...
Robert Schaub [Wed, 1 Jul 2015 17:12:31 +0000 (17:12 +0000)]
am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs

* commit 'e51d6d05e9334fce5d46909ea669027762c4c0a2':
  docs: Changed link in Java source code comment to repair 404

9 years agoCatch SecurityExceptions
Jay Shrauner [Wed, 1 Jul 2015 16:20:42 +0000 (09:20 -0700)]
Catch SecurityExceptions

Bug:22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e

9 years agoMerge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev
Filip Gruszczynski [Wed, 1 Jul 2015 17:03:02 +0000 (17:03 +0000)]
Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev

9 years agoMerge "Make querying the graphics stats service more defensive" into mnc-dev
John Reck [Wed, 1 Jul 2015 16:56:06 +0000 (16:56 +0000)]
Merge "Make querying the graphics stats service more defensive" into mnc-dev

9 years agoUse std::sort instead of quickSortX
John Reck [Wed, 1 Jul 2015 16:54:47 +0000 (09:54 -0700)]
Use std::sort instead of quickSortX

Bug: 22208220

Libcxx has a really good sort algorithm, use that
instead. This speeds up shadow tesellation by about 10%.

Also less code

Change-Id: Iaad424187121d7644076f94ba8a3cf4c110da2f2

9 years agoam c58d1695: Merge changes from topic \'tron\' into mnc-dev
Chris Wren [Wed, 1 Jul 2015 16:29:13 +0000 (16:29 +0000)]
am c58d1695: Merge changes from topic \'tron\' into mnc-dev

* commit 'c58d1695307923c8074f5803a0e01cda1869d231':
  remove double count of panel open
  report notification load on panel reveal

9 years agoam e51c46b0: Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent...
Paul Jensen [Wed, 1 Jul 2015 16:28:56 +0000 (16:28 +0000)]
am e51c46b0: Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev

* commit 'e51c46b0683114d0aa9010a45ec0443505a0b389':
  Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API

9 years agoam cb23ec41: Merge "Add missing addPauseListener." into mnc-dev
George Mount [Wed, 1 Jul 2015 16:28:47 +0000 (16:28 +0000)]
am cb23ec41: Merge "Add missing addPauseListener." into mnc-dev

* commit 'cb23ec418eb0dacee7ef9f2866b94eccd2b2ba90':
  Add missing addPauseListener.

9 years agoam 0c53a89e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 16:28:43 +0000 (16:28 +0000)]
am 0c53a89e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0c53a89ea95e62ec592811606fa7e46c1da1d509':
  Import translations. DO NOT MERGE

9 years agoam 4f18c7e0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 16:28:36 +0000 (16:28 +0000)]
am 4f18c7e0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4f18c7e0c08da7351bc8aeca7a47f20d2bf8187c':
  Import translations. DO NOT MERGE

9 years agoam 72a77993: Merge "Log DNS results for network validation attempts" into mnc-dev
Paul Jensen [Wed, 1 Jul 2015 16:28:22 +0000 (16:28 +0000)]
am 72a77993: Merge "Log DNS results for network validation attempts" into mnc-dev

* commit '72a77993bdbc2cec49714b73d222ff213be44041':
  Log DNS results for network validation attempts

9 years agoam 35daa43e: Merge "Reducing logging in NetworkMonitor to avoid getting muted" into...
Paul Jensen [Wed, 1 Jul 2015 16:28:05 +0000 (16:28 +0000)]
am 35daa43e: Merge "Reducing logging in NetworkMonitor to avoid getting muted" into mnc-dev

* commit '35daa43e5d5b3b614b837f57a06c8b7c7d87cb55':
  Reducing logging in NetworkMonitor to avoid getting muted

9 years agoam 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into...
Chris Banes [Wed, 1 Jul 2015 16:27:42 +0000 (16:27 +0000)]
am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev

* commit '2bc8485ba79cf6fa95f80b105ed914d245178a0c':
  Fix memory leak in setActionProvider() - framework edition

9 years agoam 8a752abe: Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into...
Miao Wang [Wed, 1 Jul 2015 16:27:24 +0000 (16:27 +0000)]
am 8a752abe: Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev

* commit '8a752abe77a4387bbe099befa972870ee0a48bbf':
  [RenderScript] update the type of offsets for BLAS.BNNM

9 years agoam e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev
Ronghua Wu [Wed, 1 Jul 2015 16:27:13 +0000 (16:27 +0000)]
am e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev

* commit 'e0b71b4ef7af0a8e49341ba65eaf61981845e713':
  media: clean up the usage of max-supported-instances.

9 years agoam 22233b51: Merge "Remove the empty accounts group and not needed storage resources...
Svet Ganov [Wed, 1 Jul 2015 16:27:04 +0000 (16:27 +0000)]
am 22233b51: Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev

* commit '22233b51c3c3e678571dbe5e6d1035b7e1440408':
  Remove the empty accounts group and not needed storage resources.

9 years agoam 2438c9b2: Merge "Fix dispatch of onRestoreFinished()" into mnc-dev
Christopher Tate [Wed, 1 Jul 2015 16:26:46 +0000 (16:26 +0000)]
am 2438c9b2: Merge "Fix dispatch of onRestoreFinished()" into mnc-dev

* commit '2438c9b2e7892a8515209cb1d440c3b5147165b2':
  Fix dispatch of onRestoreFinished()

9 years agoMerge changes from topic 'tron' into mnc-dev
Chris Wren [Wed, 1 Jul 2015 15:33:28 +0000 (15:33 +0000)]
Merge changes from topic 'tron' into mnc-dev

* changes:
  remove double count of panel open
  report notification load on panel reveal

9 years agoMerge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into...
Paul Jensen [Wed, 1 Jul 2015 14:31:19 +0000 (14:31 +0000)]
Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev

9 years agoMerge "Add missing addPauseListener." into mnc-dev
George Mount [Wed, 1 Jul 2015 14:10:07 +0000 (14:10 +0000)]
Merge "Add missing addPauseListener." into mnc-dev

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

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

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

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Jul 2015 13:38:57 +0000 (08:38 -0500)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Log DNS results for network validation attempts" into mnc-dev
Paul Jensen [Wed, 1 Jul 2015 12:43:13 +0000 (12:43 +0000)]
Merge "Log DNS results for network validation attempts" into mnc-dev

9 years agoMerge "Reducing logging in NetworkMonitor to avoid getting muted" into mnc-dev
Paul Jensen [Wed, 1 Jul 2015 12:42:04 +0000 (12:42 +0000)]
Merge "Reducing logging in NetworkMonitor to avoid getting muted" into mnc-dev

9 years agoFix: Selection handles can remain on home screen.
Keisuke Kuroyanagi [Wed, 1 Jul 2015 11:06:51 +0000 (20:06 +0900)]
Fix: Selection handles can remain on home screen.

This happened as selection handles are shown even when
selection action mode is not active.

Bug: 22188927
Change-Id: Ifd88b91d98cc6f9b0c578e782144b6eee1bdeec9

9 years agoMerge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
Chris Banes [Wed, 1 Jul 2015 07:58:00 +0000 (07:58 +0000)]
Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev

9 years agoMerge "Factor checksum code out of DhcpPacket." into mnc-vt-dev
Lorenzo Colitti [Wed, 1 Jul 2015 07:16:54 +0000 (07:16 +0000)]
Merge "Factor checksum code out of DhcpPacket." into mnc-vt-dev

9 years agoFactor checksum code out of DhcpPacket.
Lorenzo Colitti [Tue, 30 Jun 2015 07:32:30 +0000 (16:32 +0900)]
Factor checksum code out of DhcpPacket.

Bug: 21405946
Change-Id: I969bb4f6a812bf5aba80871b65c59db20de568b0