196687 Commits

Author SHA1 Message Date
Ruben Brunk
e4ed47087f Merge "camera2: Fix ABI for new tags." into mnc-dev 2015-07-01 20:51:17 +00:00
Dianne Hackborn
4e88bcd399 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
2015-07-01 13:41:03 -07:00
Jorim Jaggi
1eecf4701a Merge "Use correct starting size for clip reveal transition" into mnc-dev 2015-07-01 20:28:55 +00:00
Carlos Valdivia
88817de840 Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev 2015-07-01 20:15:45 +00:00
Jorim Jaggi
b00dbd47e3 Use correct starting size for clip reveal transition
Bug: 22174716
Change-Id: I807837d0c52f1e266204bb08391f8224dc3ff8c7
2015-07-01 20:06:51 +00:00
Vinit Deshpande
dd14bad82d Merge "correctly print wificonfiguration creation and update time" into mnc-dev 2015-07-01 20:06:29 +00:00
Ruben Brunk
1b02df456f camera2: Fix ABI for new tags.
Bug: 22229158
Change-Id: If8dc8524258b59b45e56ce54f451c59b9c7e79e2
2015-07-01 12:53:45 -07:00
Pierre Vandwalle
edbedd28b6 correctly print wificonfiguration creation and update time
Change-Id: I1c4abf9bed86cddea3592f0604def1a7727b73fc
2015-07-01 12:48:26 -07:00
Vinit Deshpande
edc3157948 Merge "More API review feedback" into mnc-dev 2015-07-01 19:46:55 +00:00
Svet Ganov
4e792cbe75 Workaround legacy TelephonyManager.getDefault() with no context
bug:22201450

Change-Id: If591bd90f3e4081c411dfa6415853c110a62a7fb
2015-07-01 12:41:22 -07:00
Dianne Hackborn
de15edaa9b 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
2015-07-01 12:37:00 -07:00
Svetoslav
2956363244 Merge "Grant permissions to headless system calendar/contacts sync adapters." into mnc-dev 2015-07-01 19:26:14 +00:00
Adam Lesinski
0fdd22a602 Merge "BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime" into mnc-dev 2015-07-01 19:23:25 +00:00
Svet Ganov
abbdc864f0 Merge "Clear binder identity when grantint permisisons to carrier apps" into mnc-dev 2015-07-01 19:21:11 +00:00
Adam Lesinski
43ae441ad7 BatteryStats: Don't assume every kernel reports a power field in /proc/uid_cputime
Bug:22225706
Change-Id: I4c7d889716345231564c1e96494dc84aab17cf01
2015-07-01 12:09:45 -07:00
Miao Chou
658bf2fa6d 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
2015-07-01 19:09:44 +00:00
George Mount
9488294611 Fix docs for ViewAnimationUtils.createCircularReveal
Bug 22202425

Change-Id: Ic9b5b8ec88b8ae2ece2312e3bc3d4fd49ffc1f1f
2015-07-01 11:10:58 -07:00
Chris Craik
d3ecb3e6f0 Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev 2015-07-01 18:10:33 +00:00
Makoto Onuki
a10277e3e4 Merge "Allow default SMS app to get self phone number" into mnc-dev 2015-07-01 18:06:38 +00:00
Aravind Akella
ef8d2bba23 Merge "Fix for last sensor missing from sensor list returned by the HAL." into mnc-dev 2015-07-01 18:04:44 +00:00
Jay Shrauner
b6045cb8e0 Merge "Catch SecurityExceptions" into mnc-dev 2015-07-01 18:04:37 +00:00
David Friedman
0de5908095 Merge "Docs: Fixes metadata that was getting mangled in jd_lists_unified file." into mnc-preview-docs 2015-07-01 17:58:46 +00:00
David Friedman
e562bb6bc8 Merge "Docs: Localizations of Android dev on-boarding training docs. Bug: 20503574" into mnc-preview-docs 2015-07-01 17:54:46 +00:00
Geoff Mendal
1f9d5a0950 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-01 17:54:23 +00:00
Rich Slogar
b8388f345c am 48413e6a: am 761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs
* commit '48413e6a1134137c7358217c550b2783a7df3a03':
  docs: migration guide link update
2015-07-01 17:51:23 +00:00
Filip Gruszczynski
81f8cd92fa am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '3ce79f6c0c3435eca05ea34c5a8b34ac59bcb992':
  Build fix after changing IWindowSession.
2015-07-01 17:51:18 +00:00
Aravind Akella
32207e3c66 Merge "Changes to Data Injection mode APIs" into mnc-dev 2015-07-01 17:39:57 +00:00
Geoff Mendal
5e039e64bd Import translations. DO NOT MERGE
Change-Id: I1492b302d8c75b2b6c9d5f0a51a65ab8c8d3e848
Auto-generated-cl: translation import
2015-07-01 12:29:58 -05:00
Filip Gruszczynski
0385059195 Handle outsets when resized is called due to rotation.
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.

Bug: 22209764

Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
2015-07-01 10:23:47 -07:00
Wale Ogunwale
44000724ef am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '5278cea1f35b2b54606cc1bb78195bd2f84953da':
  Prevent system uid component from running in an app process
2015-07-01 17:19:26 +00:00
Wale Ogunwale
f54d17224b am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
* commit '52034328081e8c3420f9228192343835465afa13':
  Prevent system uid component from running in an app process
2015-07-01 17:19:20 +00:00
Wale Ogunwale
7ab264abc2 am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '742bfa809cf2c022d690f84b4213e908ee66e8aa':
  Prevent system uid component from running in an app process
2015-07-01 17:17:23 +00:00
Luan Nguyen
0794acc557 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
2015-07-01 17:13:03 +00:00
Amit Mahajan
4b2d706155 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.
2015-07-01 17:12:53 +00:00
Joe Fernandez
3cc50169fe 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.
2015-07-01 17:12:45 +00:00
Rich Slogar
d88767da1e am e3d8df63: am 3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs
* commit 'e3d8df63076241a3d3637643e6ff1530bca5a5b2':
  docs: studio workflow page typo
2015-07-01 17:12:39 +00:00
Robert Schaub
a50979997c 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
2015-07-01 17:12:31 +00:00
Jay Shrauner
6ce5d68a58 Catch SecurityExceptions
Bug:22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e
2015-07-01 10:07:17 -07:00
Wale Ogunwale
5278cea1f3 am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit 'd72dc76275d7d0cc9559e0e5439bcc3ccbda81a2':
  Prevent system uid component from running in an app process
2015-07-01 17:03:58 +00:00
Wale Ogunwale
5203432808 am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev
* commit '131e6b24d88c4704687f41e9a016ab1919c53fa4':
  Prevent system uid component from running in an app process
2015-07-01 17:03:54 +00:00
Filip Gruszczynski
d40c423b1c Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev 2015-07-01 17:03:03 +00:00
Wale Ogunwale
742bfa809c am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit 'f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
  Prevent system uid component from running in an app process
2015-07-01 17:03:02 +00:00
John Reck
a4ac386d2a Merge "Make querying the graphics stats service more defensive" into mnc-dev 2015-07-01 16:56:09 +00:00
John Reck
1e4209e387 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
2015-07-01 09:54:47 -07:00
Wale Ogunwale
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
2015-07-01 16:39:11 +00:00
David Friedman
c921ee10a3 Docs: Localizations of Android dev on-boarding training docs.
Bug: 20503574

Change-Id: I348ca743dc106eef7cca5ff8d9855398fc3b3b54
2015-07-01 09:36:33 -07:00
Wale Ogunwale
d72dc76275 am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit 'ec425a19f973e2511485b61424dffb9f3cafb542':
  Prevent system uid component from running in an app process
2015-07-01 16:35:21 +00:00
Wale Ogunwale
131e6b24d8 Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 2015-07-01 16:30:43 +00:00
Wale Ogunwale
ec425a19f9 am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process
2015-07-01 16:18:42 +00:00
Wale Ogunwale
c215b2b245 am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit 'dc9cfca80139714ca37122148d041beedbf0ceb2':
  Prevent system uid component from running in an app process
2015-07-01 16:18:17 +00:00