OSDN Git Service
Paul McLean [Fri, 15 May 2015 16:26:30 +0000 (16:26 +0000)]
am
0c72f4f9: Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev
* commit '
0c72f4f9d04077f2fe96b486b8501303325a54af':
Change AudioDevicesInfo.getFormats() to getEncodings().
Tor Norbye [Fri, 15 May 2015 16:26:25 +0000 (16:26 +0000)]
am
f02fd46d: Merge "Add bluetooth permission annotations" into mnc-dev
* commit '
f02fd46d34624b4549565be777deff8328bbdc05':
Add bluetooth permission annotations
George Mount [Fri, 15 May 2015 16:26:20 +0000 (16:26 +0000)]
am
b1f12933: Merge "Remove hidden/deleted APIs." into mnc-dev
* commit '
b1f1293355a1837d95095d28891f9218bdcf2bdd':
Remove hidden/deleted APIs.
Dan Sandler [Fri, 15 May 2015 16:26:15 +0000 (16:26 +0000)]
am
d63f9321: Icon support comes to Notification.
* commit '
d63f9321e62064660d426efd5abbd885c4a24652':
Icon support comes to Notification.
Dan Sandler [Fri, 15 May 2015 16:24:59 +0000 (16:24 +0000)]
am
aee0c2ce: Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev
* commit '
aee0c2ce39fe92716bb76d33d6f8cc8789467cf6':
Use Context instead of Resources in Icon.createWithResource.
Matthew Williams [Fri, 15 May 2015 16:24:54 +0000 (16:24 +0000)]
am
af9ea2cf: Merge "Fix bug with jobservice context giving wrong value" into mnc-dev
* commit '
af9ea2cf5e9f4848b3d1078cc261931e1339e7cf':
Fix bug with jobservice context giving wrong value
Lorenzo Colitti [Fri, 15 May 2015 16:24:46 +0000 (16:24 +0000)]
am
bdc8b6d2: Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev
* commit '
bdc8b6d247716c08d4ee6e7187e46c5f3da3fbba':
Statically import NetworkCapabilities constants for brevity.
Paul McLean [Fri, 15 May 2015 14:35:48 +0000 (14:35 +0000)]
Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev
Tor Norbye [Fri, 15 May 2015 14:21:12 +0000 (14:21 +0000)]
Merge "Add bluetooth permission annotations" into mnc-dev
George Mount [Fri, 15 May 2015 14:08:17 +0000 (14:08 +0000)]
Merge "Remove hidden/deleted APIs." into mnc-dev
Dan Sandler [Wed, 6 May 2015 19:18:49 +0000 (15:18 -0400)]
Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
And you may ask yourself: where does that API go to?
And you may ask yourself: is it a resource? is it a Bitmap?
And you may say to yourself: my god, what have I done
(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)
Bug:
18568715
Bug:
21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
Dan Sandler [Fri, 15 May 2015 04:39:41 +0000 (04:39 +0000)]
Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev
Matthew Williams [Fri, 15 May 2015 03:51:57 +0000 (03:51 +0000)]
Merge "Fix bug with jobservice context giving wrong value" into mnc-dev
Matthew Williams [Fri, 15 May 2015 00:47:33 +0000 (17:47 -0700)]
Fix bug with jobservice context giving wrong value
BUG:
20614145
Change-Id: Ibd555732e03646d6d59e6d0effa9f92ec70ca3c4
Lorenzo Colitti [Fri, 15 May 2015 03:37:22 +0000 (03:37 +0000)]
Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev
Jae Seo [Fri, 15 May 2015 02:47:31 +0000 (02:47 +0000)]
am
0a8e06cb: Merge "TIF: Remove incorrect audio mode check" into mnc-dev
* commit '
0a8e06cbd3e7489e3878e27dbea98a264ebf5363':
TIF: Remove incorrect audio mode check
Jae Seo [Fri, 15 May 2015 02:44:21 +0000 (02:44 +0000)]
Merge "TIF: Remove incorrect audio mode check" into mnc-dev
Jae Seo [Fri, 15 May 2015 02:16:30 +0000 (19:16 -0700)]
TIF: Remove incorrect audio mode check
Bug:
21170680
Change-Id: If50181294d7b2977d8e0735ae4d118943e0aad60
Christopher Tate [Fri, 15 May 2015 02:00:19 +0000 (02:00 +0000)]
am
abcbf05c: Merge "fullBackupContent isn\'t public API" into mnc-dev
* commit '
abcbf05c98980f2a77adb5dfb2f7d8b7ec804024':
fullBackupContent isn't public API
Ruben Brunk [Fri, 15 May 2015 01:50:47 +0000 (01:50 +0000)]
am
096c11dc: Merge "camera2: Fix work-profile eviction handling." into mnc-dev
* commit '
096c11dc3795120dbc75cc1ee15abaa019fb74d1':
camera2: Fix work-profile eviction handling.
Sailesh Nepal [Fri, 15 May 2015 01:50:42 +0000 (01:50 +0000)]
am
8309a191: Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev
* commit '
8309a19181151a78a288368becd3d3a9b1b1e389':
Fix in-call UI crash on Nova devcies (framework/base)
Christopher Tate [Fri, 15 May 2015 01:50:38 +0000 (01:50 +0000)]
Merge "fullBackupContent isn't public API" into mnc-dev
Yorke Lee [Fri, 15 May 2015 01:50:37 +0000 (01:50 +0000)]
am
d76a81f5: Merge "Fix missing break in Icon class" into mnc-dev
* commit '
d76a81f5195b8a23b136f5a9965d3b5dd12a195d':
Fix missing break in Icon class
Ruben Brunk [Fri, 15 May 2015 01:45:18 +0000 (01:45 +0000)]
Merge "camera2: Fix work-profile eviction handling." into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:40:09 +0000 (01:40 +0000)]
Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev
Ruben Brunk [Fri, 1 May 2015 00:46:30 +0000 (17:46 -0700)]
camera2: Fix work-profile eviction handling.
Bug:
20124384
Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
Yorke Lee [Fri, 15 May 2015 01:39:03 +0000 (01:39 +0000)]
Merge "Fix missing break in Icon class" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:28:10 +0000 (18:28 -0700)]
Fix in-call UI crash on Nova devcies (framework/base)
If a status hint icon wasn't set we'd crash.
Fix was to set StatusHitns.mIcon to null if the icon resource ID'
was 0.
BUG:
21168985
Change-Id: I33c06169f9e184b063e6fd10f77408bc262ea3c8
Yorke Lee [Fri, 15 May 2015 01:22:02 +0000 (18:22 -0700)]
Fix missing break in Icon class
This causes RuntimeExceptions to fall through to the next
case statement.
Bug:
21168985
Change-Id: Ie69610b22c6caf9f6536ebd48673067880cb75a2
Sailesh Nepal [Fri, 15 May 2015 01:06:12 +0000 (01:06 +0000)]
am
ebb1d76e: Merge "Fix post dial for remote connections" into mnc-dev
* commit '
ebb1d76e32535df04be5baab72fc067decf8ee15':
Fix post dial for remote connections
Sailesh Nepal [Fri, 15 May 2015 00:55:39 +0000 (00:55 +0000)]
Merge "Fix post dial for remote connections" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 00:39:41 +0000 (17:39 -0700)]
Fix post dial for remote connections
Use the correct callback (onPostDialChar instead of onPostDialWait).
This fixes a bug where every remote call would prompt the user
to send tones after the call became active.
BUG:
21004101
Change-Id: I1656a4266d0028ef29494a3cee169180267e16cd
Doris Liu [Fri, 15 May 2015 00:37:25 +0000 (00:37 +0000)]
am
4b4d4757: Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev
* commit '
4b4d4757698718f785aa534b69a117007f5b64a7':
Start AnimationDrawable from the zeroth frame.
Doris Liu [Fri, 15 May 2015 00:28:32 +0000 (00:28 +0000)]
Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev
Doris Liu [Thu, 14 May 2015 22:12:23 +0000 (15:12 -0700)]
Start AnimationDrawable from the zeroth frame.
This CL fixes the issue where when start is called, we run the next frame
of the animation drawable while mCurFrame is already set to 0. The result
is that the first frame of the AnimationDrawable is then skipped.
Bug:
21168854
Change-Id: I2b77ae017d3debd0f8cfec81ea86d1120e78bb55
Tor Norbye [Fri, 24 Apr 2015 00:10:21 +0000 (17:10 -0700)]
Add bluetooth permission annotations
Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7
Deepanshu Gupta [Fri, 15 May 2015 00:14:54 +0000 (00:14 +0000)]
am
2cdf5eaa: Merge "Fix build: udpate parser factory method" into mnc-dev
* commit '
2cdf5eaad4ad84fc87b73945fdd3262da4a0ab43':
Fix build: udpate parser factory method
Deepanshu Gupta [Fri, 15 May 2015 00:01:51 +0000 (00:01 +0000)]
Merge "Fix build: udpate parser factory method" into mnc-dev
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
John Reck [Thu, 14 May 2015 23:45:44 +0000 (23:45 +0000)]
am
0e4a2b5f: Merge "Check for setting to already set" into mnc-dev
* commit '
0e4a2b5ff0ee061c46bfe3b1f15a7067308e0da8':
Check for setting to already set
Svet Ganov [Thu, 14 May 2015 23:45:39 +0000 (23:45 +0000)]
am
e650fd95: Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev
* commit '
e650fd95a9d87f74fb420687b7062c9d428ef3f1':
Fix grant/revoke to act on owner by default and log invalid user id.
Jorim Jaggi [Thu, 14 May 2015 23:34:04 +0000 (23:34 +0000)]
am
fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev
* commit '
fcb34c599f59d3bd73edad1848c081548e721024':
Adjust lockscreen style to spec
Jorim Jaggi [Thu, 14 May 2015 23:33:57 +0000 (23:33 +0000)]
am
97993692: Fix brightness mirror positioning.
* commit '
979936920ee2e654e23678172c49b301e886c374':
Fix brightness mirror positioning.
Deepanshu Gupta [Thu, 14 May 2015 23:33:49 +0000 (23:33 +0000)]
am
af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev
* commit '
af4d3d2d141b905fe6f92c9cce81ee76a8203fd8':
Don't keep LayoutlibCallback reference.
Jinsuk Kim [Thu, 14 May 2015 23:29:19 +0000 (23:29 +0000)]
am
f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev
* commit '
f2fb0e73f1e7a056c8986959b391ad29eabbf8f9':
CEC: Remove obsolete TODOs
John Reck [Thu, 14 May 2015 23:27:47 +0000 (23:27 +0000)]
Merge "Check for setting to already set" into mnc-dev
Svet Ganov [Thu, 14 May 2015 23:25:09 +0000 (23:25 +0000)]
Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev
Svet Ganov [Thu, 14 May 2015 23:18:05 +0000 (16:18 -0700)]
Fix grant/revoke to act on owner by default and log invalid user id.
bug:
21163229
Change-Id: I66d0cc130b37b5752ed06afc73259ed41bfb7830
Jorim Jaggi [Thu, 14 May 2015 23:15:23 +0000 (23:15 +0000)]
Merge "Adjust lockscreen style to spec" into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 00:39:18 +0000 (17:39 -0700)]
Fix brightness mirror positioning.
Bug:
20884993
Change-Id: Iba75c2dd7aca9b7ac446cb6a278085af4e150b95
John Reck [Thu, 14 May 2015 22:47:03 +0000 (15:47 -0700)]
Check for setting to already set
Bug:
20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f
Jorim Jaggi [Thu, 14 May 2015 21:13:20 +0000 (14:13 -0700)]
Adjust lockscreen style to spec
Bug:
21111048
Change-Id: Ibdecaf01224ef45a53b4981d8b79d27034a3df45
Deepanshu Gupta [Thu, 14 May 2015 22:57:02 +0000 (22:57 +0000)]
Merge "Don't keep LayoutlibCallback reference." into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 22:47:05 +0000 (22:47 +0000)]
Merge "CEC: Remove obsolete TODOs" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference.
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.
Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
Miao Wang [Thu, 14 May 2015 22:35:04 +0000 (22:35 +0000)]
am
39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev
* commit '
39a0b22cf854963dc04dc7a7714b4a7a263e93aa':
[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
Jorim Jaggi [Thu, 14 May 2015 22:34:59 +0000 (22:34 +0000)]
am
3e02adb0: Fix closing state
* commit '
3e02adb028741938dab9787fa1552f86b2558c9a':
Fix closing state
Deepanshu Gupta [Thu, 14 May 2015 22:25:33 +0000 (22:25 +0000)]
am
a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev
* commit '
a8545890ac7851dbd113535e14d170e083357f5b':
Move couple of intellij libraries to project level.
Christopher Tate [Thu, 14 May 2015 22:25:28 +0000 (22:25 +0000)]
am
474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
* commit '
474bb82fd5dafdba8de917ed7a834ba68890678f':
Clarify docs for BackupTransport.initializeDevice()
Yin-Chia Yeh [Thu, 14 May 2015 22:25:22 +0000 (22:25 +0000)]
am
a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev
* commit '
a0807a65e93aeb7c73fb2fcc68244ab324dd3c07':
Camera: tonemap linkify update
Miao Wang [Thu, 14 May 2015 22:22:01 +0000 (22:22 +0000)]
Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 00:50:26 +0000 (17:50 -0700)]
Fix closing state
Bug:
20940663
Change-Id: I34e2bf4fb3ba9f9ad15e634c4a09883f57b446b2
Deepanshu Gupta [Thu, 14 May 2015 22:18:32 +0000 (22:18 +0000)]
Merge "Move couple of intellij libraries to project level." into mnc-dev
Christopher Tate [Thu, 14 May 2015 22:16:32 +0000 (22:16 +0000)]
Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:12:57 +0000 (15:12 -0700)]
Move couple of intellij libraries to project level.
Move framework and layoutlib api libraries back to being project
libraries so that other modules can depend on it. This enables custom
widget libraries project to merge through cleanly.
Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f
Yin-Chia Yeh [Thu, 14 May 2015 22:12:29 +0000 (22:12 +0000)]
Merge "Camera: tonemap linkify update" into mnc-dev
Miao Wang [Thu, 14 May 2015 21:53:30 +0000 (14:53 -0700)]
[RenderScript] Add dummy getMinorID to maintain compatible with old RS
compat lib.
bug:
21132592
Change-Id: I375f188dfbd33367a9589533aa51b182fda8bc21
Christopher Tate [Thu, 14 May 2015 20:20:10 +0000 (13:20 -0700)]
fullBackupContent isn't public API
Bug
21090205
Change-Id: I1b468f1e7bf86455576760e4a1d1ea9657074a9e
Paul McLean [Thu, 14 May 2015 21:57:08 +0000 (14:57 -0700)]
Change AudioDevicesInfo.getFormats() to getEncodings().
Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
Zhijun He [Thu, 14 May 2015 21:55:49 +0000 (21:55 +0000)]
am
758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
* commit '
758e6a8f70b28e1584588b06b12d227deeefba74':
ImageReader: Image getFormat should return the Image buffer format
Zhijun He [Thu, 14 May 2015 21:55:43 +0000 (21:55 +0000)]
am
492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev
* commit '
492afe901459274ea8b9dd52815d3f51dd1f244f':
Image/Reader/Writer: address API review comments
Zhijun He [Thu, 14 May 2015 21:46:36 +0000 (21:46 +0000)]
Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
Zhijun He [Thu, 14 May 2015 21:43:59 +0000 (21:43 +0000)]
Merge "Image/Reader/Writer: address API review comments" into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 21:28:47 +0000 (06:28 +0900)]
CEC: Remove obsolete TODOs
Removed legacy TODOs and the associated hack to enable CEC service
for buggy partner low-level implementation.
Bug:
21153475
Change-Id: I105f77389dd5c604336f86ce375016fa87c86759
Joe LaPenna [Thu, 14 May 2015 21:37:12 +0000 (21:37 +0000)]
am
21de2f62: am
08bea4c9: (-s ours) am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
21de2f629df37014dd269e746924374f3df0811a':
Wait for KEY_SLEEP UP event before calling goToSleep()
Chong Zhang [Thu, 14 May 2015 21:37:07 +0000 (21:37 +0000)]
am
7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev
* commit '
7fc802bbf750a8ed6be0e1858ebcf9740dda15cb':
MediaDataSource: address API council comments
Zhijun He [Wed, 13 May 2015 19:11:47 +0000 (12:11 -0700)]
Image/Reader/Writer: address API review comments
* Remove isOpaque methods
* Removew ImageReader#newOpaqueInstance
* Rename Writer listener and callback
* Clarify the timestamp spec
* Fix a bug in ImageUtils
Bug:
21044520
Change-Id: Ifb85ef25e4d152c2a445b3369c1e16dc1bc5220c
Joe LaPenna [Thu, 14 May 2015 21:34:16 +0000 (21:34 +0000)]
am
08bea4c9: (-s ours) am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
08bea4c90dce2991ab518bd167a29df8b23f7d1b':
Wait for KEY_SLEEP UP event before calling goToSleep()
Chong Zhang [Thu, 14 May 2015 21:29:50 +0000 (21:29 +0000)]
Merge "MediaDataSource: address API council comments" into mnc-dev
Lajos Molnar [Thu, 14 May 2015 21:25:36 +0000 (21:25 +0000)]
am
51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
* commit '
51bf5d9c078a57b52da786979103674588c2116c':
media: remove setPlaybackRate from MediaPlayer and MediSync
Lajos Molnar [Thu, 14 May 2015 21:25:30 +0000 (21:25 +0000)]
am
af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
* commit '
af0479446bf2bfaa252bfe4bc924346632013f40':
media: change final fields to accessors in MediaTimestamp
Xiaohui Chen [Thu, 14 May 2015 21:21:07 +0000 (21:21 +0000)]
am
55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
* commit '
55a302402be3240c9e3289351c01e1cd2e853bc8':
wallpaper: avoid exception when user is not initialized
Chong Zhang [Thu, 14 May 2015 17:08:08 +0000 (10:08 -0700)]
MediaDataSource: address API council comments
- throw IOExecption on fatal errors
- add offset argument to readAt
- and fix a crash in MediaExtractor
bug:
21045118
bug:
21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
Lajos Molnar [Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)]
Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
Lajos Molnar [Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)]
Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
George Mount [Fri, 8 May 2015 21:21:20 +0000 (14:21 -0700)]
Remove hidden/deleted APIs.
Change-Id: Iabeaac2c9b485f1f25fb2fcc3193610b0d6478c4
Joe LaPenna [Thu, 14 May 2015 21:07:54 +0000 (21:07 +0000)]
am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
627f26817f752e0e1beb4185e778edc4501b4aa6':
Wait for KEY_SLEEP UP event before calling goToSleep()
Xiaohui Chen [Thu, 14 May 2015 21:05:35 +0000 (21:05 +0000)]
Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
Joe LaPenna [Thu, 14 May 2015 20:55:08 +0000 (20:55 +0000)]
Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
Chien-Yu Chen [Thu, 14 May 2015 20:50:31 +0000 (20:50 +0000)]
am
3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
* commit '
3b7bc569e6e31b7cb4a074e0d23994f7a4797feb':
Camera2: Fix reprocessing API naming and docs
Mikhail Naganov [Thu, 14 May 2015 20:50:26 +0000 (20:50 +0000)]
am
93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev
* commit '
9355966878460e3103a8da5eac8ecb5d2de97717':
Tiny fix after updating the error reporting API
Chien-Yu Chen [Thu, 14 May 2015 20:46:35 +0000 (20:46 +0000)]
Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
Mikhail Naganov [Thu, 14 May 2015 20:43:04 +0000 (20:43 +0000)]
Merge "Tiny fix after updating the error reporting API" into mnc-dev
Joseph Wen [Thu, 14 May 2015 20:39:46 +0000 (20:39 +0000)]
am
de355db3: Merge "Change the location of Brandmaster statement file." into mnc-dev
* commit '
de355db3ec6e24dd75ccec93f6c613f8f114ab28':
Change the location of Brandmaster statement file.
Joseph Wen [Thu, 14 May 2015 20:31:06 +0000 (20:31 +0000)]
Merge "Change the location of Brandmaster statement file." into mnc-dev
Mikhail Naganov [Thu, 14 May 2015 20:30:13 +0000 (13:30 -0700)]
Tiny fix after updating the error reporting API
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.
Bug:
20064008,
21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
Alan Viverette [Thu, 14 May 2015 20:29:18 +0000 (20:29 +0000)]
am
f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
* commit '
f93d16bc705027aaca3a9c36788e0c1f26233bd0':
Avoid sealed check when unparceling AccessibilityNodeInfo
Jason Sams [Thu, 14 May 2015 20:29:13 +0000 (20:29 +0000)]
am
f0616532: Merge "Fix issues found during CTS testing of FP16" into mnc-dev
* commit '
f06165320281ef1cb5e7ebbeef42a93a77cbd553':
Fix issues found during CTS testing of FP16
Alan Viverette [Thu, 14 May 2015 20:20:47 +0000 (20:20 +0000)]
Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
Jason Sams [Thu, 14 May 2015 20:15:39 +0000 (20:15 +0000)]
Merge "Fix issues found during CTS testing of FP16" into mnc-dev