OSDN Git Service
Luan Nguyen [Fri, 3 Apr 2015 22:11:14 +0000 (22:11 +0000)]
am
9b9bda56: am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
9b9bda56238feabb07b7f6f0ad93f007c24de25d':
docs: Remove note about inablity to submit apps to Google Play.
Luan Nguyen [Fri, 3 Apr 2015 22:01:12 +0000 (22:01 +0000)]
am
b7647017: am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
docs: Remove note about inablity to submit apps to Google Play.
Luan Nguyen [Fri, 3 Apr 2015 21:49:32 +0000 (21:49 +0000)]
am
eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit '
eeb42053df94de88674caf904a96ec987d55e668':
docs: Remove note about inablity to submit apps to Google Play.
Luan Nguyen [Fri, 3 Apr 2015 21:40:52 +0000 (21:40 +0000)]
Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
Quddus Chong [Fri, 3 Apr 2015 21:19:15 +0000 (21:19 +0000)]
am
d9e2c05d: am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
d9e2c05dbf6c6f418b08a8465f1ed8f051015b41':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Quddus Chong [Fri, 3 Apr 2015 21:08:49 +0000 (21:08 +0000)]
am
0c3b894c: am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
0c3b894c2c18b226f58af98569f21bcb4a593b14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Quddus Chong [Fri, 3 Apr 2015 20:57:44 +0000 (20:57 +0000)]
am
91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
* commit '
91070dc419b9b60843094ecc02f95b38c784208a':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Joe LaPenna [Fri, 3 Apr 2015 20:55:00 +0000 (20:55 +0000)]
Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
Quddus Chong [Fri, 3 Apr 2015 20:47:45 +0000 (20:47 +0000)]
Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
Wale Ogunwale [Fri, 3 Apr 2015 00:26:49 +0000 (00:26 +0000)]
am
4a7967ad: am
f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
* commit '
4a7967ad9ac76d8b9d6285bc367c33d1b6c83235':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
Wale Ogunwale [Fri, 3 Apr 2015 00:15:26 +0000 (00:15 +0000)]
am
f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
* commit '
f61aee97adf4e543e82289511c6127bcfa53151c':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
Wale Ogunwale [Fri, 3 Apr 2015 00:07:03 +0000 (00:07 +0000)]
Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
Wale Ogunwale [Thu, 2 Apr 2015 23:13:57 +0000 (16:13 -0700)]
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.
Bug:
19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
Filip Gruszczynski [Thu, 2 Apr 2015 21:35:58 +0000 (14:35 -0700)]
Make burn in protection updates happen on the minute.
Bug:
20052872
Change-Id: Iff7e081a9ae99b457024537b8c64b7c2572b6172
Simon Wilson [Thu, 2 Apr 2015 20:57:52 +0000 (20:57 +0000)]
Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev
Andrew Solovay [Thu, 2 Apr 2015 20:10:55 +0000 (20:10 +0000)]
am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:10:48 +0000 (20:10 +0000)]
am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
61ce6c9b705e41800662b33601c01a4848c174d3':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 19:56:41 +0000 (19:56 +0000)]
am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 19:56:35 +0000 (19:56 +0000)]
am
776cf41d: Fix a broken link in javadoc
* commit '
776cf41d7c8f239d20397886f2120407396cfc87':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 19:25:24 +0000 (19:25 +0000)]
Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
Yuichi Araki [Fri, 20 Mar 2015 09:01:02 +0000 (18:01 +0900)]
Fix a broken link in javadoc
Bug:
19856130
Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
Eric Gilmore [Thu, 2 Apr 2015 01:06:52 +0000 (01:06 +0000)]
am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
f2204720eac6fd959eb5a3732c0084636bc16095':
Changing wording to reflect c2dm shutdown.
Eric Gilmore [Thu, 2 Apr 2015 00:59:34 +0000 (00:59 +0000)]
am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
b2b93762b8165ee47f49765816fc7ba0428c371c':
Changing wording to reflect c2dm shutdown.
Eric Gilmore [Wed, 1 Apr 2015 23:13:25 +0000 (23:13 +0000)]
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
Quddus Chong [Thu, 5 Mar 2015 21:16:24 +0000 (13:16 -0800)]
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Change-Id: I421a29c90a0763665fd93aa85e86d2c6f33ad894
Scott Rowe [Wed, 1 Apr 2015 21:35:39 +0000 (21:35 +0000)]
am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:25:53 +0000 (21:25 +0000)]
am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
4fc3d3ff404c777e07616b704c68176d9060c4e4':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:05:41 +0000 (21:05 +0000)]
Merge "docs: Building Live TV Apps" into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:55:08 +0000 (19:55 +0000)]
am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
92aa846daf64119d5951453c0298f83115f26d48':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 19:55:02 +0000 (19:55 +0000)]
am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
03bafac781492fed392cb6bcdc8773a44076c705':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 19:54:52 +0000 (19:54 +0000)]
am
b2bd8f8a: am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
b2bd8f8ac8405beaa5b531d1e23256315d7555bc':
docs: Add voice intent for starting a stopwatch
Luan Nguyen [Wed, 1 Apr 2015 19:43:57 +0000 (19:43 +0000)]
am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
d01ada25155ed82644b9cc23313c04d3f1a5721a':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 19:43:54 +0000 (19:43 +0000)]
am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
649d839b82a8fafc99ae79ba1ad5fc12218391cb':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Luan Nguyen [Wed, 1 Apr 2015 19:43:39 +0000 (19:43 +0000)]
am
7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
* commit '
7542c44ee45a195404eccf50a82df7903e2ecd9c':
docs: Add voice intent for starting a stopwatch
Luan Nguyen [Wed, 1 Apr 2015 19:24:29 +0000 (19:24 +0000)]
Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:23:20 +0000 (19:23 +0000)]
Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
Luan Nguyen [Wed, 1 Apr 2015 19:21:39 +0000 (19:21 +0000)]
Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
Bryce Lee [Wed, 1 Apr 2015 19:09:33 +0000 (19:09 +0000)]
Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev
Scott Rowe [Thu, 5 Feb 2015 19:46:10 +0000 (11:46 -0800)]
docs: Building Live TV Apps
Change-Id: I8d0015e6c8a8a24c661434ca5cf88defd27ae8cf
Andrew Solovay [Wed, 1 Apr 2015 18:21:31 +0000 (18:21 +0000)]
am
aabcf5b5: am
b2255d4f: docs: Fixed a typo.
* commit '
aabcf5b562b6ebad59d1789c73d054782d5f25e4':
docs: Fixed a typo.
Andrew Solovay [Wed, 1 Apr 2015 18:11:01 +0000 (18:11 +0000)]
am
b2255d4f: docs: Fixed a typo.
* commit '
b2255d4f10230b51de373528aaee7b12cc9e2f2b':
docs: Fixed a typo.
Bryce Lee [Wed, 1 Apr 2015 17:57:21 +0000 (10:57 -0700)]
Do not use the status bar as the system decor layer if it is not visible.
Doing so leads to cropping of the content view, which is smaller than the
screen size on some devices with improperly configured overscan values. It
can also lead to performance issues with some activity transition
animations on Wear.
Bug:
19928768
Change-Id: Ic50c2fedb1f8be9a8ea5166fef5a5665958601de
Luan Nguyen [Tue, 31 Mar 2015 19:32:53 +0000 (12:32 -0700)]
docs: Add voice intent for starting a stopwatch
bug:
19931486
Change-Id: I9895966da1203e1f95ac29a61f9613548b8f2177
Luan Nguyen [Fri, 13 Feb 2015 19:07:44 +0000 (11:07 -0800)]
docs: Remove misleading information about hardware layer performance
benefits for optimizing views.
bug:
18356775
Change-Id: Ideac15f1eb42fe4c2e291800458bf739cd6a9b4a
Geoff Mendal [Wed, 1 Apr 2015 09:46:18 +0000 (02:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I488ba02367861ca1c84acd44e1a7aaee31e71108
Auto-generated-cl: translation import
Andrew Solovay [Tue, 31 Mar 2015 17:47:56 +0000 (10:47 -0700)]
docs: Fixed formatting in android:documentLaunchMode syntax section
Also fixed the line breaks in android:configChanges so the syntax
code box doesn't need a horizontal scroll bar.
See first comment for doc stage location.
bug:
19935160
Change-Id: I1ec34473e743a9f0c921f771cfb47129c47f9014
Andrew Solovay [Tue, 31 Mar 2015 19:10:47 +0000 (12:10 -0700)]
docs: Fixed a typo.
See first comment for doc stage location.
bug:
19709151
Change-Id: I182cb76c55acd32da921420b3ef37d330cf63bb0
Kenny Root [Tue, 31 Mar 2015 19:10:48 +0000 (19:10 +0000)]
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
Svetoslav [Tue, 31 Mar 2015 16:41:00 +0000 (16:41 +0000)]
am
c6be7545: am
37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
* commit '
c6be7545b4106b9ba586e365f2d2ab911cafea93':
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
Kenny Root [Tue, 31 Mar 2015 16:40:14 +0000 (16:40 +0000)]
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
Svetoslav [Tue, 31 Mar 2015 16:33:21 +0000 (16:33 +0000)]
am
37661db7: AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
* commit '
37661db7fa58c0559ef2b73b6f8c38124e3acd4a':
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
Kenny Root [Tue, 31 Mar 2015 16:11:34 +0000 (09:11 -0700)]
Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
This reverts commit
693ea60e9e3d2ef476e4f45caac234360d90bdb9.
Bug:
19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
Kenny Root [Tue, 31 Mar 2015 16:09:42 +0000 (09:09 -0700)]
Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
This reverts commit
4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.
Bug:
19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
Andreas Gampe [Tue, 31 Mar 2015 01:43:39 +0000 (18:43 -0700)]
Frameworks/base: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.
Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.
Bug:
19992386
(cherry picked from commit
e0352388238875ef7e7b31d914fc903b08ff0f6b)
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
Svetoslav [Thu, 29 Jan 2015 00:44:02 +0000 (16:44 -0800)]
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.
bug:
16954787
Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit
5738fec00db65e0ee246475a7236e57ba3ee8d55)
Rich Slogar [Mon, 30 Mar 2015 21:37:05 +0000 (21:37 +0000)]
am
b1dc614d: am
f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '
b1dc614d151a90e8745964157f0f7bc2c145894f':
docs: build tools 22.0.1 revision updates
Rich Slogar [Mon, 30 Mar 2015 21:30:39 +0000 (21:30 +0000)]
am
f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '
f80370c60118441c0022333a5b4f8cda99c86774':
docs: build tools 22.0.1 revision updates
Rich Slogar [Mon, 30 Mar 2015 21:24:19 +0000 (21:24 +0000)]
Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
Luan Nguyen [Wed, 11 Mar 2015 16:36:08 +0000 (09:36 -0700)]
docs: Update ambient mode to mention disabling bitmap filtering
bug:
19429396
Change-Id: I51c1c58211cbdcb8c293b693627c659fd55537cf
Luan Nguyen [Thu, 19 Mar 2015 19:27:43 +0000 (12:27 -0700)]
docs: Remove note about inablity to submit apps to Google Play.
Change-Id: I15577e02ac4a4fed247209f9115439dc4216018e
Geoff Mendal [Mon, 30 Mar 2015 14:38:42 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I386da39a3fc78ac9e7878f8962bb4a513d907893
Auto-generated-cl: translation import
Bart Sears [Fri, 27 Mar 2015 21:23:01 +0000 (21:23 +0000)]
am
d4c3ef87: am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
d4c3ef87f8aaef9eb5ec66856dffc9eca5537573':
CEC: Explicitly turn on screen for remote control passthrough
Bart Sears [Fri, 27 Mar 2015 21:14:37 +0000 (21:14 +0000)]
am
4a26c391: Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
* commit '
4a26c391d08dfa6a3c189293f0fc163b817b1b49':
CEC: Explicitly turn on screen for remote control passthrough
Bart Sears [Fri, 27 Mar 2015 20:48:37 +0000 (20:48 +0000)]
Merge "CEC: Explicitly turn on screen for remote control passthrough" into lmp-mr1-dev
Deepanshu Gupta [Fri, 27 Mar 2015 02:58:47 +0000 (02:58 +0000)]
am
61bb0b4f: am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 02:58:40 +0000 (02:58 +0000)]
am
7b73a788: am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
7b73a788f0c18a31de729daa51e7e06286cf7609':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 02:49:27 +0000 (02:49 +0000)]
am
4e6ae02a: am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
4e6ae02a29dd432648a81f3803f3ccf712621d43':
Fix tests for Java 6.
Christopher Tate [Fri, 27 Mar 2015 02:49:23 +0000 (02:49 +0000)]
am
dbe0dd16: When scanning unbundled apps, only install the expected APK tree
* commit '
dbe0dd160e93feef1335830a36e86ae83b19b793':
When scanning unbundled apps, only install the expected APK tree
Deepanshu Gupta [Fri, 27 Mar 2015 01:09:53 +0000 (01:09 +0000)]
am
17bb697b: am
ec8df9af: Fix tests for Java 6.
* commit '
17bb697b3bce1b23137553829dd62e0e7c16b472':
Fix tests for Java 6.
Deepanshu Gupta [Fri, 27 Mar 2015 01:02:58 +0000 (01:02 +0000)]
am
ec8df9af: Fix tests for Java 6.
* commit '
ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
Fix tests for Java 6.
Michael Runge [Fri, 27 Mar 2015 00:50:41 +0000 (00:50 +0000)]
am
9e3976b6: am
9a91bf1d: am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
9e3976b6feba28b027122af25b21c9eca6705f0f':
Increase timeout when uncrypting OTA
Amith Yamasani [Fri, 27 Mar 2015 00:50:33 +0000 (00:50 +0000)]
am
c704bc64: am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
c704bc647270c30b5c38d53d10228325befeb0b7':
Deepanshu Gupta [Fri, 27 Mar 2015 00:50:27 +0000 (00:50 +0000)]
am
cfdd1e18: am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
cfdd1e18a8039b8c0b1c1f260018cac3a613c3ec':
Deepanshu Gupta [Fri, 27 Mar 2015 00:50:19 +0000 (00:50 +0000)]
am
85afc992: am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
85afc992ea0058155c73b2ad06f130df7bc697f4':
Deepanshu Gupta [Fri, 27 Mar 2015 00:50:00 +0000 (00:50 +0000)]
am
0c8ccefc: am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
0c8ccefc54f4ddb2cc91df093bc09bd4ac8a1215':
Deepanshu Gupta [Fri, 27 Mar 2015 00:49:53 +0000 (00:49 +0000)]
am
c07448d2: am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
c07448d22ccc802acef341684d182898b6d449b6':
Deepanshu Gupta [Fri, 27 Mar 2015 00:49:46 +0000 (00:49 +0000)]
Deepanshu Gupta [Fri, 27 Mar 2015 00:49:40 +0000 (00:49 +0000)]
am
5bbc0265: am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
5bbc026536f460c90f17f4554bad554f72df0009':
Jeff Brown [Fri, 27 Mar 2015 00:49:33 +0000 (00:49 +0000)]
am
64646def: am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
64646defa7d01ca4105a5da8cc8d0999dac1543d':
Michael Runge [Fri, 27 Mar 2015 00:35:12 +0000 (00:35 +0000)]
am
9a91bf1d: am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
9a91bf1d18d3855b4bdaaa613fa10372da6e530e':
Increase timeout when uncrypting OTA
Amith Yamasani [Fri, 27 Mar 2015 00:35:00 +0000 (00:35 +0000)]
am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
0afd1905b59446fc471680325bcbea802bb37c5c':
Fix NPE if FPE service does not exist.
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:21 +0000 (00:34 +0000)]
am
862f5900: am
44b5a1c8: am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
862f5900e8abce1cc20979a4dca76e1f0b982880':
Update JRE for runConfigurations.
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:12 +0000 (00:34 +0000)]
am
dbb38b30: am
cbb4ec78: am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
dbb38b30612dc054ba3bf066f8528cccfceb47ad':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Fri, 27 Mar 2015 00:34:01 +0000 (00:34 +0000)]
am
e97079d9: am
a16bb347: am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
e97079d97a5c914d06c24cb9deda1da9bea88aeb':
Fix RoundRect radius.
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:56 +0000 (00:33 +0000)]
am
2b98abde: am
8f9ebc65: am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
2b98abde26aa2033562b48d635d6f2ba11c48908':
Use right colors for status bar and nav bar.
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:52 +0000 (00:33 +0000)]
am
6fa9d554: am
0b76cf6f: am
34751c79: Merge "Better shadows." into lmp-dev
* commit '
6fa9d5546fa27665de3f64564897a77735b2a1b0':
Better shadows.
Deepanshu Gupta [Fri, 27 Mar 2015 00:33:47 +0000 (00:33 +0000)]
am
5bc625d8: am
a62a18e3: am
311a0f54: Merge "Fix layoutlib tests." into lmp-dev
* commit '
5bc625d83d60fbb27ab2297051971be91fb3e415':
Fix layoutlib tests.
Jeff Brown [Fri, 27 Mar 2015 00:33:21 +0000 (00:33 +0000)]
am
d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit '
d62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
Christopher Tate [Thu, 26 Mar 2015 22:38:29 +0000 (15:38 -0700)]
When scanning unbundled apps, only install the expected APK tree
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state. When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.
Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.
Bug
19602471
Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
Deepanshu Gupta [Thu, 26 Mar 2015 18:08:43 +0000 (11:08 -0700)]
Fix tests for Java 6.
- Change the guava version used to match the one included in the SDK.
The test server uses the same. However, the command line build still
uses the guava present at platform/external/guava, which is compiled
with Java 7. Thus, running the tests from inside the IDE can be done
via Java 6.
- Rebuilt the test app classes with Java 6 compatibility.
- Change similarity threshold to prevent differences due to some locale
settings different java versions.
Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
Michael Runge [Thu, 26 Mar 2015 04:08:24 +0000 (04:08 +0000)]
am
96f47f5b: am
b0197033: Increase timeout when uncrypting OTA
* commit '
96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
Increase timeout when uncrypting OTA
Michael Runge [Thu, 26 Mar 2015 03:57:33 +0000 (03:57 +0000)]
am
b0197033: Increase timeout when uncrypting OTA
* commit '
b019703395ae0304ddd10054843c64db87229d23':
Increase timeout when uncrypting OTA
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug:
18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit
01c06dfb076b71cb72c4bff9175bec9d59d2efde)
Jinsuk Kim [Tue, 24 Mar 2015 07:55:01 +0000 (16:55 +0900)]
CEC: Explicitly turn on screen for remote control passthrough
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.
Bug:
19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit
9b8507c52ae845c8eed9fd9952bf66538934b8fd)
Filip Gruszczynski [Wed, 25 Mar 2015 22:37:36 +0000 (22:37 +0000)]
Merge "Don't use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev
Amith Yamasani [Wed, 25 Mar 2015 22:19:20 +0000 (22:19 +0000)]
am
0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
* commit '
0afd1905b59446fc471680325bcbea802bb37c5c':
Fix NPE if FPE service does not exist.
Amith Yamasani [Wed, 25 Mar 2015 22:12:44 +0000 (22:12 +0000)]
Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev
Bryce Lee [Wed, 25 Mar 2015 18:51:39 +0000 (11:51 -0700)]
add correct exception throw declaration to isScreenBrightnessBoosted.
Change-Id: I9b861002d7719ad43643d68f6795df6938bd0fc3
Bryce Lee [Wed, 25 Mar 2015 18:16:23 +0000 (11:16 -0700)]
Implement isScreenBrightnessBoosted in BridgePowerManager.
Change-Id: I7da132c7522e5c352e14123f059b900008d94c95
Bryce Lee [Wed, 25 Mar 2015 16:06:13 +0000 (16:06 +0000)]
Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
OSDN Git Service
