OSDN Git Service
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
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
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
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
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
Selim Cinek [Wed, 1 Jul 2015 22:03:30 +0000 (22:03 +0000)]
Merge "Fixed accessibility order for quick settings" 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
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
John Reck [Wed, 1 Jul 2015 20:54:45 +0000 (20:54 +0000)]
Merge "Use std::sort instead of quickSortX" 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
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
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
Carlos Valdivia [Wed, 1 Jul 2015 20:15:42 +0000 (20:15 +0000)]
Merge "Tweak GET_ACCOUNTS behavior and improve memory." into mnc-dev
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
Vinit Deshpande [Wed, 1 Jul 2015 20:06:22 +0000 (20:06 +0000)]
Merge "correctly print wificonfiguration creation and update time" into mnc-dev
Ruben Brunk [Wed, 1 Jul 2015 19:53:45 +0000 (12:53 -0700)]
camera2: Fix ABI for new tags.
Bug:
22229158
Change-Id: If8dc8524258b59b45e56ce54f451c59b9c7e79e2
Pierre Vandwalle [Wed, 1 Jul 2015 19:48:26 +0000 (12:48 -0700)]
correctly print wificonfiguration creation and update time
Change-Id: I1c4abf9bed86cddea3592f0604def1a7727b73fc
Vinit Deshpande [Wed, 1 Jul 2015 19:46:48 +0000 (19:46 +0000)]
Merge "More API review feedback" into mnc-dev
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
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
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
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
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
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
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
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
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
Jay Shrauner [Wed, 1 Jul 2015 18:04:34 +0000 (18:04 +0000)]
Merge "Catch SecurityExceptions" 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
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
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.
Aravind Akella [Wed, 1 Jul 2015 17:39:54 +0000 (17:39 +0000)]
Merge "Changes to Data Injection mode APIs" into mnc-dev
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
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
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.
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.
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
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
Jay Shrauner [Wed, 1 Jul 2015 16:20:42 +0000 (09:20 -0700)]
Catch SecurityExceptions
Bug:
22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e
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
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
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
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
Paul Jensen [Wed, 1 Jul 2015 14:31:19 +0000 (14:31 +0000)]
Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev
George Mount [Wed, 1 Jul 2015 14:10:07 +0000 (14:10 +0000)]
Merge "Add missing addPauseListener." 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
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
Geoff Mendal [Wed, 1 Jul 2015 13:40:42 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
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
Paul Jensen [Wed, 1 Jul 2015 12:43:13 +0000 (12:43 +0000)]
Merge "Log DNS results for network validation attempts" 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
Chris Banes [Wed, 1 Jul 2015 07:58:00 +0000 (07:58 +0000)]
Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
Miao Wang [Wed, 1 Jul 2015 05:12:05 +0000 (05:12 +0000)]
Merge "[RenderScript] update the type of offsets for BLAS.BNNM" into mnc-dev
Ronghua Wu [Wed, 1 Jul 2015 04:00:20 +0000 (04:00 +0000)]
Merge "media: clean up the usage of max-supported-instances." into mnc-dev
Svet Ganov [Wed, 1 Jul 2015 02:40:17 +0000 (19:40 -0700)]
Clear binder identity when grantint permisisons to carrier apps
bug:
22204562
Change-Id: I79dc2e102d227c991adc849e1cbda8572ee14905
Selim Cinek [Fri, 26 Jun 2015 18:49:18 +0000 (14:49 -0400)]
Fixed accessibility order for quick settings
Bug:
20535538
Change-Id: I4e464c54158eb575208f6361af295ae702b19b21
Svet Ganov [Wed, 1 Jul 2015 02:32:47 +0000 (02:32 +0000)]
Merge "Remove the empty accounts group and not needed storage resources." into mnc-dev
Carlos Valdivia [Thu, 18 Jun 2015 03:17:37 +0000 (20:17 -0700)]
Tweak GET_ACCOUNTS behavior and improve memory.
Related to recent permissions and system health changes. This change
will make it so that calls to AccountManager#getAccountsByType will work
for the owning account authenticator even if they don't have
permissions. This is pretty fundamental to having a working
authenticator and it doesn't make sense to have it be disabled (or have
authenticators hack around the framework).
Also changed how TokenCache works so that memory usage is still
predictable (no more than 64kb) but token caching won't be at the mercy
of garbage collection. This is important for writing stable cts tests.
Change-Id: Ib31b550616b266ee5a04eb26b04ba0023ca0cb83
Christopher Tate [Wed, 1 Jul 2015 01:25:52 +0000 (01:25 +0000)]
Merge "Fix dispatch of onRestoreFinished()" into mnc-dev
Svetoslav [Wed, 1 Jul 2015 01:05:26 +0000 (18:05 -0700)]
Grant permissions to headless system calendar/contacts sync adapters.
bug:
21861781
Change-Id: I5f9905a23ba1b23e387adf2cea842172d34207b0
Aravind Akella [Wed, 1 Jul 2015 01:02:45 +0000 (18:02 -0700)]
Fix for last sensor missing from sensor list returned by the HAL.
Bug:
22072216
Change-Id: I39a422fb80adcd348ff9c10bf3d3f19ab569a0af
Christopher Tate [Wed, 1 Jul 2015 00:48:46 +0000 (17:48 -0700)]
Fix dispatch of onRestoreFinished()
The agent instance wasn't properly being conveyed from the generic
restore engine implementation to the state machine handling the
lifecycles. On top of that, the lifecycle wasn't advancing to the
restore-finished callback phase properly in the full-data restore
case.
Bug
22194736
Change-Id: Ic649d6a196adbd21a4a0f3083c7eed2fff383e52
Chris Craik [Wed, 1 Jul 2015 00:56:13 +0000 (17:56 -0700)]
Switch from fminf/fmaxf to std::min/max
bug:
22208220
Shows considerable improvement in performance, especially in tight
loops.
Change-Id: I4bcf6584a3c145bfc55e73c9c73dcf6199290b3c
Svet Ganov [Wed, 1 Jul 2015 00:55:40 +0000 (00:55 +0000)]
Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev
Yohei Yukawa [Wed, 1 Jul 2015 00:51:33 +0000 (00:51 +0000)]
Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev
Jeff Sharkey [Wed, 1 Jul 2015 00:42:40 +0000 (00:42 +0000)]
Merge "Hand out storage to more system apps." into mnc-dev
Dianne Hackborn [Wed, 1 Jul 2015 00:41:44 +0000 (00:41 +0000)]
Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
Adam Lesinski [Wed, 1 Jul 2015 00:40:00 +0000 (00:40 +0000)]
Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
Jeff Sharkey [Wed, 1 Jul 2015 00:32:45 +0000 (17:32 -0700)]
Hand out storage to more system apps.
Grant storage access to the Storage Access Framework provider that
offers to delegate access to storage devices. Also grant to the
default music app.
Bug:
22104872
Change-Id: I8cf7dceec8b4c1e31f8ddd40b094ccd4ecb1caf8
Jeff Sharkey [Tue, 30 Jun 2015 23:59:40 +0000 (23:59 +0000)]
Merge "Fully unmount existing storage in Zygote." into mnc-dev
Dianne Hackborn [Tue, 30 Jun 2015 21:38:17 +0000 (14:38 -0700)]
Fix issue #
22124996: VI: Command Request not Active
Just forgot to add the request to the active set.
Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.
Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
Jorim Jaggi [Tue, 30 Jun 2015 23:19:17 +0000 (16:19 -0700)]
Fix overexpand panel motion
Expanding was already set to false when we decided which QS
overscroll animation to run. We can't change the order of expanding
finished/tracking finished because of another bug. Instead, let the
stack scroller know about tracking state and combine both of them.
Bug:
21705230
Change-Id: I041ff1fabc6c939c233528f9d08d804ead64bbab
Jorim Jaggi [Tue, 30 Jun 2015 20:35:11 +0000 (13:35 -0700)]
Fix Keyguard header animation from SHADE_LOCKED -> Keyguard
Bug:
22128249
Change-Id: I36dbecc41e66922987c1b753d62bde27cb3b17be
Yohei Yukawa [Tue, 30 Jun 2015 23:22:05 +0000 (16:22 -0700)]
Reland "Fixed constant window switching on lock screen..."
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.
Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.
Bug:
18021493
Bug:
22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
ztenghui [Tue, 30 Jun 2015 23:20:29 +0000 (23:20 +0000)]
Merge "Update the doc for VectorDrawable's Tint support" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Add helper function to extract app ID from shared app gid." into mnc-dev
Svet Ganov [Tue, 30 Jun 2015 01:27:20 +0000 (18:27 -0700)]
Rename uses-permission-m to uses-permission-23
bug:
20072113
Change-Id: Ia872853274c604a6fee1c1d84f82a98334523bac
Amith Yamasani [Tue, 30 Jun 2015 23:00:06 +0000 (23:00 +0000)]
Merge "Don't allow non-admins to adopt sd card for internal storage" into mnc-dev
ztenghui [Tue, 30 Jun 2015 22:58:55 +0000 (15:58 -0700)]
Update the doc for VectorDrawable's Tint support
b/
21726146
Change-Id: I262f77b980afa81407b008276190062974cdc4fa
Jeff Sharkey [Tue, 30 Jun 2015 22:56:33 +0000 (15:56 -0700)]
Fully unmount existing storage in Zygote.
Before mounting the requested storage into place, fully unmount all
existing mounts inherited from the root namespace.
Bug:
22192518
Change-Id: I6f7f12c1219d25ee487a031d37c60fb4051d24ad
Chet Haase [Tue, 30 Jun 2015 22:46:42 +0000 (22:46 +0000)]
Merge "Invalidate parent when scrolling child view back onto screen" into mnc-dev
Alan Viverette [Tue, 30 Jun 2015 22:44:57 +0000 (22:44 +0000)]
Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
Vinit Deshpande [Tue, 30 Jun 2015 20:43:02 +0000 (13:43 -0700)]
More API review feedback
ScanResult now hides all flags and their values, only methods
are public; and converted roaming consortium to an array of longs
instead of Longs.
Bug:
22179306
Change-Id: I644110dbddd5fa7a7109ac16051845fcc4c4e9d1
Deepanshu Gupta [Tue, 30 Jun 2015 22:41:46 +0000 (22:41 +0000)]
Merge "Replace infinite loop with foreach." into mnc-dev
Deepanshu Gupta [Tue, 30 Jun 2015 22:41:34 +0000 (22:41 +0000)]
Merge "Add missing resolveResValue call." into mnc-dev
Deepanshu Gupta [Tue, 30 Jun 2015 21:30:55 +0000 (14:30 -0700)]
Replace infinite loop with foreach.
A method call exists to find all inner classes. Use it instead of
manually enumerating the possibilities and checking.
Also fix a typo.
Change-Id: I2af678e92ea0c11b53617b247d8cda324391c185
Chet Haase [Tue, 30 Jun 2015 22:31:10 +0000 (15:31 -0700)]
Invalidate parent when scrolling child view back onto screen
This bug caused views which used to be quick-rejected to continue to not
be drawn because the parent's DisplayList no longer contained them. The
fix is to notice when offsetting a view puts it back on screen and invalidates
the parent appropriately.
Issue #
21413554 offsetTopAndBottom requires invalidating parent when view becomes visible again
Change-Id: I0f5d2cc48e3da912a41635712d9c37fb30e70c86
Rich Slogar [Tue, 30 Jun 2015 22:31:52 +0000 (22:31 +0000)]
am
761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs
* commit '
761b4a7deb2438e039fdb11a05e2de41593ffd8f':
docs: migration guide link update
Jorim Jaggi [Tue, 30 Jun 2015 18:41:32 +0000 (11:41 -0700)]
Don't show orb when voice session is already running
Bug:
22195186
Change-Id: I7839536d2f6362889a924b65011d80556f0176b8
Jorim Jaggi [Tue, 30 Jun 2015 18:31:10 +0000 (11:31 -0700)]
Make sure endClosing doesn't get called too early
Bug:
22196478
Bug:
22184101
Change-Id: I3488c40b74a080efbba9b1544f9709f7e509988b
Alan Viverette [Tue, 30 Jun 2015 21:06:13 +0000 (14:06 -0700)]
Use non-greedy view to draw background in landscape time picker
Bug:
21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
Rich Slogar [Tue, 30 Jun 2015 22:21:16 +0000 (22:21 +0000)]
Merge "docs: migration guide link update" into mnc-preview-docs
Filip Gruszczynski [Tue, 30 Jun 2015 22:17:55 +0000 (22:17 +0000)]
am
96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '
96496e2d17607a8bfa944461c2458b0dcdeee872':
Build fix after changing IWindowSession.
Filip Gruszczynski [Tue, 30 Jun 2015 22:03:30 +0000 (15:03 -0700)]
resolved conflicts for merge of
300ccf4a to mnc-dev
Change-Id: Ia315e314bfde0c066a2c25d93f8cbdc71fee0a14
Filip Gruszczynski [Tue, 30 Jun 2015 22:02:32 +0000 (22:02 +0000)]
Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
Luan Nguyen [Tue, 30 Jun 2015 22:02:23 +0000 (22:02 +0000)]
am
ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs
* commit '
ed053477d0f76edad4853f0a5aac275acfe2d6ce':
docs: Move scale Bitmap code to onSurfaceChanged
Adam Lesinski [Fri, 26 Jun 2015 23:33:24 +0000 (16:33 -0700)]
Add helper function to extract app ID from shared app gid.
Bug:
22008744
Change-Id: Ifadc7df3777dd74932833f4d22a0e285d7bdaf95
Amit Mahajan [Tue, 30 Jun 2015 21:55:08 +0000 (21:55 +0000)]
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 '
71699d760eff662055dde458ea0d614a32fb6dfc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 21:55:01 +0000 (21:55 +0000)]
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 '
cbbbabaa4aa1cbb84cb49133ecda1da2f06daf54':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Luan Nguyen [Tue, 30 Jun 2015 21:53:15 +0000 (21:53 +0000)]
Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs