git.osdn.net Git - android-x86/frameworks-base.git/log

Jinsuk Kim [Tue, 9 Dec 2014 01:00:50 +0000 (01:00 +0000)]

am 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev

* commit '62bb43dbec930b7a4dc2272d8ed4da73d9aef8b1':
CEC: Avoid setting op in disabled mode

commit | commitdiff | tree

David Friedman [Tue, 9 Dec 2014 01:00:45 +0000 (01:00 +0000)]

am 587d349e: am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d.

* commit '587d349eff8c19ee8380cb4dc2751608986d7e83':
Fixes (updates) download links for NDK r10d.

commit | commitdiff | tree

Jeff Davidson [Tue, 9 Dec 2014 01:00:40 +0000 (01:00 +0000)]

am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

* commit '5550a408c4b9a530674a1766875f272e46a1e1fb':
Show "Connected via Wi-Fi assistant" for ephemeral networks.

commit | commitdiff | tree

Jeff Davidson [Tue, 9 Dec 2014 01:00:34 +0000 (01:00 +0000)]

am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev

* commit '0efd29fc57c7369e2371aa3226e90f97331f517a':
Fix flipped captive portal bit in network conditions bcast.

commit | commitdiff | tree

Jeff Davidson [Tue, 9 Dec 2014 01:00:29 +0000 (01:00 +0000)]

am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59':
add disable Ephemeral Network API Bug:18525241

commit | commitdiff | tree

Jeremy Joslin [Tue, 9 Dec 2014 01:00:09 +0000 (01:00 +0000)]

am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev

* commit 'd4753450f37d88fec11d1405250529ca794ae70c':
Don't send the same PendingIntent more than once.

commit | commitdiff | tree

Evan Charlton [Tue, 9 Dec 2014 01:00:04 +0000 (01:00 +0000)]

am 1b001cae: am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev

* commit '1b001caed3f2ee150850830dba371f13d61d5512':
Associate a UserHandle with each PhoneAccountHandle

commit | commitdiff | tree

Paul Jensen [Tue, 9 Dec 2014 01:00:00 +0000 (01:00 +0000)]

am 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev

* commit '446a59bc26ffab59e05bb0967bb27758170dbcf5':
Reap unvalidated networks that have no chance of becoming highest scoring.

commit | commitdiff | tree

Jeff Tinker [Tue, 9 Dec 2014 00:59:55 +0000 (00:59 +0000)]

am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev

* commit 'f062d8d7df6b6ca72f103d133a3483cd91c95c60':
Unhide secure stop APIs

commit | commitdiff | tree

Jinsong Mu [Tue, 9 Dec 2014 00:59:45 +0000 (00:59 +0000)]

am 5a181a24: am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev

* commit '5a181a2436fb629c2298b9bfb0b2848b514edbe6':
Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003

commit | commitdiff | tree

Ihab Awad [Tue, 9 Dec 2014 00:59:40 +0000 (00:59 +0000)]

am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

* commit '657f25e9641e7c546032adf90b9c4bdaef36eab9':
Add Text-to-Speech annotations for phone number displays (1/3)

commit | commitdiff | tree

David Friedman [Tue, 9 Dec 2014 00:59:34 +0000 (00:59 +0000)]

am ad9e0d5e: am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs

* commit 'ad9e0d5ed57d9d32074566e6da400d1a7313236a':
Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117

commit | commitdiff | tree

RoboErik [Tue, 9 Dec 2014 00:59:30 +0000 (00:59 +0000)]

am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev

* commit 'b22eea724b4f1d1ccbb1fd7ddd2eb3d9eb3204c8':
Route mute key events through MediaSessionService

commit | commitdiff | tree

Quddus Chong [Tue, 9 Dec 2014 00:59:23 +0000 (00:59 +0000)]

am 0d9d5d0a: am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs

* commit '0d9d5d0a838a5eaea6c5915358ee089b9ae0e45e':
docs: Added API highlights for Google Play service v6.5 (Nacho) release.

commit | commitdiff | tree

Quddus Chong [Tue, 9 Dec 2014 00:59:17 +0000 (00:59 +0000)]

am a40c6b04: am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs

* commit 'a40c6b0479c9fbc738aeb04c0cd585d00d6ba9c5':
docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.

commit | commitdiff | tree

Wale Ogunwale [Tue, 9 Dec 2014 00:59:11 +0000 (00:59 +0000)]

am 30b74ccf: am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev

* commit '30b74ccf69474333e9ec42192fb1b23b3dcc420d':
Don't destroy surfaces of activities launched behind early.

commit | commitdiff | tree

Filip Gruszczynski [Tue, 9 Dec 2014 00:59:06 +0000 (00:59 +0000)]

am 73f0e9a3: am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev

* commit '73f0e9a3feec091f67c9db00ce2d3116b6d91fbd':
Fix calculation of overscan insets in WindowState.

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 00:59:01 +0000 (00:59 +0000)]

am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

* commit '0cfdd810ded6f8486a6b0a61044594f58ab5c052':
Fix issue #17323751: Additional items in aggregated battery stats

commit | commitdiff | tree

ztenghui [Tue, 9 Dec 2014 00:19:43 +0000 (00:19 +0000)]

am 4cb33e76: am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev

* commit '4cb33e7657f9adae41fda5fd95c23060f515a238':
Fine tune the light radius from 800dp to 600dp

commit | commitdiff | tree

Sanket Padawe [Tue, 9 Dec 2014 00:19:38 +0000 (00:19 +0000)]

am 17c2719d: am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev

* commit '17c2719d037bee0823dd90c363cee4716ed43d5b':
Doing provisioning check for wifi tethering from SystemUI

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 9 Dec 2014 00:19:23 +0000 (00:19 +0000)]

am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

* commit 'b71d983a7ff7ba0d993c32692035ae92db0c9a44':
Camera2: Add HDR scene mode for backwards compatibility.

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 9 Dec 2014 00:19:15 +0000 (00:19 +0000)]

am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev

* commit 'cfdc0762e22ec82fa6f6d98abf1d14d5f54ab633':
Fix docs build

commit | commitdiff | tree

Stuart Scott [Tue, 9 Dec 2014 00:19:09 +0000 (00:19 +0000)]

am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

* commit '6b0025ea7ca0e7343ee95bc622261b2f3e86012a':
Add mapping between RAT and Network Mode

commit | commitdiff | tree

Jing Zhao [Tue, 9 Dec 2014 00:19:03 +0000 (00:19 +0000)]

am 8d50d0fb: am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature

* commit '8d50d0fb27c1958dbd047bb8a46d7183d873f131':
Add checking to find AppDirectedSmsProxy for App Directed SMS feature

commit | commitdiff | tree

Chris Wren [Tue, 9 Dec 2014 00:18:57 +0000 (00:18 +0000)]

am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev

* commit 'd4ba216a0f0e7b175fa1aa6a054c6f257cb88c17':
Avoid race condition in heads up snooze code path.

commit | commitdiff | tree

Christopher Tate [Tue, 9 Dec 2014 00:18:52 +0000 (00:18 +0000)]

am a2a5d4d0: am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev

* commit 'a2a5d4d043378b1a7e3630f89f182a32affac27f':
Correctly parse previous PMBA state during backup

commit | commitdiff | tree

Christopher Tate [Tue, 9 Dec 2014 00:18:47 +0000 (00:18 +0000)]

am bd2d8202: am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev

* commit 'bd2d8202e353cda22e288452c4feb8344f20c5ef':
Tune delivery and batching of alarms

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 9 Dec 2014 00:18:39 +0000 (00:18 +0000)]

am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev

* commit '913c9895466c6749aa1c41b875d69d5de3e3b66b':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

commit | commitdiff | tree

Justin Harrison [Tue, 9 Dec 2014 00:18:35 +0000 (00:18 +0000)]

am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev

* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
Add UUID for Pbap client

commit | commitdiff | tree

Ihab Awad [Tue, 9 Dec 2014 00:18:30 +0000 (00:18 +0000)]

am 91fd7728: am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev

* commit '91fd77283b41e988e6dea0ba02a5994f00b8e1ad':
Relax access on deprecated fields for compatibility.

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 00:18:26 +0000 (00:18 +0000)]

am b3014b0f: am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev

* commit 'b3014b0f3ae26c5b8e42bee79600a293787866da':
RTL support for Lollipop Land.

commit | commitdiff | tree

Fyodor Kupolov [Tue, 9 Dec 2014 00:18:21 +0000 (00:18 +0000)]

am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev

* commit 'd483a85e69c3bb83b25473b93806e063b72c9315':
Added isRemovingAdmin method

commit | commitdiff | tree

Amith Yamasani [Tue, 9 Dec 2014 00:18:16 +0000 (00:18 +0000)]

am 333c4a96: am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev

* commit '333c4a968edc48d4a0ceb1e82f8f9b520696be8a':
Correct check of is user running

commit | commitdiff | tree

Cheuksan Wang [Tue, 9 Dec 2014 00:18:12 +0000 (00:18 +0000)]

am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

* commit '673f443f7e92956399c322b31a14178436fa723b':
add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE

commit | commitdiff | tree

Amith Yamasani [Tue, 9 Dec 2014 00:18:07 +0000 (00:18 +0000)]

am 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev

* commit '81b27f4c9fcdb1e3379152d08a3abc0fb5e62c53':
Potential fix for accidental deactivation of profile owner

commit | commitdiff | tree

ztenghui [Tue, 9 Dec 2014 00:18:02 +0000 (00:18 +0000)]

am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev

* commit '9bb5cef91f82f883a8899dee5fad56111648f1e1':
AVD: Deep copy the animator target setup when mutate.

commit | commitdiff | tree

Clare Bayley [Tue, 9 Dec 2014 00:17:57 +0000 (00:17 +0000)]

am 2bfb88ca: am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs

* commit '2bfb88ca6e84a8fc8d38eb9c4786919cadbbdce3':
Updating screenshots to LMP release and N6

commit | commitdiff | tree

RoboErik [Tue, 9 Dec 2014 00:17:53 +0000 (00:17 +0000)]

am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev

* commit '0713f9449306b6a08ca8102f76452db270b6486a':
Make setting the session token in MediaBrowserService synchronous

commit | commitdiff | tree

Dan Sandler [Tue, 9 Dec 2014 00:17:48 +0000 (00:17 +0000)]

am c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev

* commit 'c92c94a5b645805372cf1c9d11d9d19dcd71ad91':
Don't forget to listen for USER_ALL broadcasts.

commit | commitdiff | tree

Benjamin Franz [Tue, 9 Dec 2014 00:17:44 +0000 (00:17 +0000)]

am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev

* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
Change the routing path of bluetooth headset connections.

commit | commitdiff | tree

Justin Harrison [Tue, 9 Dec 2014 00:17:39 +0000 (00:17 +0000)]

am 79e346fe: am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev

* commit '79e346fe1bdb4f03e318c9f7ff3b3c7178800413':
Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.

commit | commitdiff | tree

Raph Levien [Tue, 9 Dec 2014 00:17:35 +0000 (00:17 +0000)]

am 72ebd648: am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

* commit '72ebd648b790b524a9ba96c924c57193c31b5052':
Add 8 more scripts to the font fallback chain.

commit | commitdiff | tree

Dongwon Kang [Tue, 9 Dec 2014 00:17:28 +0000 (00:17 +0000)]

am 6077acaf: am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev

* commit '6077acaf14899fc6dacb4bd73337e4a22b5e2b01':
TIF: handle a race condition when a session is crashed

commit | commitdiff | tree

Dongwon Kang [Tue, 9 Dec 2014 00:17:23 +0000 (00:17 +0000)]

am 46e18c1d: am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev

* commit '46e18c1d4159e1d34197d756e5df6a3d2e60ad04':
TIF: increase the time threshold for tune operation which was too harsh

commit | commitdiff | tree

Filip Gruszczynski [Tue, 9 Dec 2014 00:17:18 +0000 (00:17 +0000)]

am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

* commit '5ae61a811afca4fa7ddca1e4693f0b84fd09a6dc':
Private Window flag to disable touch events in WallpaperService.

commit | commitdiff | tree

Ricardo Cervera-Navarro [Tue, 9 Dec 2014 00:17:14 +0000 (00:17 +0000)]

am e2c8b5ba: am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs

* commit 'e2c8b5ba1cb39533464f52bda3ee59334737014d':
Revert "docs: Long press to dismiss fix by Wayne"

commit | commitdiff | tree

Raph Levien [Tue, 9 Dec 2014 00:17:09 +0000 (00:17 +0000)]

am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev

* commit '1918d0276ad502e45944bd75a187dd22021790c5':
Change Linkify leniency to VALID

commit | commitdiff | tree

Nancy Chen [Tue, 9 Dec 2014 00:17:04 +0000 (00:17 +0000)]

am 8940955a: am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev

* commit '8940955a0878b777309e5171ad899562d3c58406':
Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 00:16:59 +0000 (00:16 +0000)]

am 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev

* commit '34e7003a78005e86326c86345561e986978723c6':
Fix issue #18593636: Turn on "kill important processes that...

commit | commitdiff | tree

Alan Viverette [Tue, 9 Dec 2014 00:16:54 +0000 (00:16 +0000)]

am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

* commit '5f5e13d07fcf7531c0bb61f147732a430ad5aeda':
Avoid extra saveLayer calls in RippleDrawable, fix docs

commit | commitdiff | tree

Svetoslav [Tue, 9 Dec 2014 00:16:48 +0000 (00:16 +0000)]

am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.

* commit 'f477aeb367f05a64a03ed09efc9e0a9d6f9a6ec2':
Ensure all events from a showing window are dispatched.

commit | commitdiff | tree

Lajos Molnar [Tue, 9 Dec 2014 00:16:43 +0000 (00:16 +0000)]

am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev

* commit '967da505b2cb96ed85161fd940dbecb467bfe38c':
media: allow full range of Vorbis sampling rates

commit | commitdiff | tree

Jinsuk Kim [Tue, 9 Dec 2014 00:16:37 +0000 (00:16 +0000)]

am 3f771d87: am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev

* commit '3f771d879cb75a4d8e3b1a2d98f02f76c16cccd1':
CEC: Introduce the retry for commands on the new device discovery.

commit | commitdiff | tree

Dianne Hackborn [Tue, 9 Dec 2014 00:16:31 +0000 (00:16 +0000)]

am 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev

* commit '7039f6b423d2795eea6bebc932c9cb0d8422de88':
Add test for isolated services.

commit | commitdiff | tree

Nick Chalko [Tue, 9 Dec 2014 00:16:25 +0000 (00:16 +0000)]

am b7459df4: am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev

* commit 'b7459df472d74d1a1e6ba46b4a72409f984ebd98':
docs: Fix typo, use --> user

commit | commitdiff | tree

Chet Haase [Tue, 9 Dec 2014 00:16:20 +0000 (00:16 +0000)]

am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev

* commit '0a8cc945ce92263ae8b66db7d08c224865b34470':
Fix seeking behavior

commit | commitdiff | tree

Joe Fernandez [Tue, 9 Dec 2014 00:16:15 +0000 (00:16 +0000)]

am 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs

* commit '29fb654ee95a4c11c8db70c7c9c6133a161672f2':
docs: Fixes for App Indexing training class

commit | commitdiff | tree

Luan Nguyen [Tue, 9 Dec 2014 00:16:11 +0000 (00:16 +0000)]

am 4d1b8b6c: am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs

* commit '4d1b8b6c290973c3f58dd9eb1e164fa8b08d93c0':
docs: Update MessageAPI notes to mention the unreliable transmission nature.

commit | commitdiff | tree

smain@google.com [Tue, 9 Dec 2014 00:16:06 +0000 (00:16 +0000)]

am 1bef46b9: am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs

* commit '1bef46b9b3118f4fd204e3f9ff534f36cb27a706':
update L Preview message and disallow crawling /preview

commit | commitdiff | tree

Zhentao Sun [Tue, 9 Dec 2014 00:16:01 +0000 (00:16 +0000)]

am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev

* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
Fixed a leak in GeofenceHardwareImpl.java.

commit | commitdiff | tree

Raph Levien [Mon, 8 Dec 2014 21:46:15 +0000 (13:46 -0800)]

resolved conflicts for merge of b9d21d62 to master

Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2

commit | commitdiff | tree

Jason Monk [Mon, 8 Dec 2014 20:29:25 +0000 (20:29 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

commit | commitdiff | tree

Jason Monk [Mon, 8 Dec 2014 20:29:16 +0000 (20:29 +0000)]

am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev

* commit '0538e675db393777ca1090725b71d54d78fce007':
Make CarrierText handle multi-sim

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 20:29:11 +0000 (20:29 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 8 Dec 2014 20:14:50 +0000 (12:14 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Jinsuk Kim [Mon, 8 Dec 2014 19:37:44 +0000 (19:37 +0000)]

am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev

* commit '122e704a017b51ffd3da0721059d04f00c726ce8':
CEC: Avoid setting op in disabled mode

commit | commitdiff | tree

David Friedman [Mon, 8 Dec 2014 19:37:37 +0000 (19:37 +0000)]

am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d.

* commit 'cac94aa0791b04fd328b18c56da3d4815f142fe7':
Fixes (updates) download links for NDK r10d.

commit | commitdiff | tree

Jeff Davidson [Mon, 8 Dec 2014 19:36:46 +0000 (19:36 +0000)]

am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
Show "Connected via Wi-Fi assistant" for ephemeral networks.

commit | commitdiff | tree

Jeff Davidson [Mon, 8 Dec 2014 19:36:39 +0000 (19:36 +0000)]

am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev

* commit '386effc7a160e330420f7746f41d46c12f64579d':
Fix flipped captive portal bit in network conditions bcast.

commit | commitdiff | tree

Jeff Davidson [Mon, 8 Dec 2014 19:36:33 +0000 (19:36 +0000)]

am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev

* commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39':
add disable Ephemeral Network API Bug:18525241

commit | commitdiff | tree

Jeremy Joslin [Mon, 8 Dec 2014 19:36:27 +0000 (19:36 +0000)]

am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev

* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
Don't send the same PendingIntent more than once.

commit | commitdiff | tree

Evan Charlton [Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)]

am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev

* commit '068a078645b5f146c09a986398eda9df24d1ef3e':
Associate a UserHandle with each PhoneAccountHandle

commit | commitdiff | tree

Paul Jensen [Mon, 8 Dec 2014 19:36:08 +0000 (19:36 +0000)]

am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev

* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
Reap unvalidated networks that have no chance of becoming highest scoring.

commit | commitdiff | tree

Jeff Tinker [Mon, 8 Dec 2014 19:35:59 +0000 (19:35 +0000)]

am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev

* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
Unhide secure stop APIs

commit | commitdiff | tree

Jinsong Mu [Mon, 8 Dec 2014 19:35:31 +0000 (19:35 +0000)]

am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev

* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003

commit | commitdiff | tree

Ihab Awad [Mon, 8 Dec 2014 19:35:17 +0000 (19:35 +0000)]

am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
Add Text-to-Speech annotations for phone number displays (1/3)

commit | commitdiff | tree

David Friedman [Mon, 8 Dec 2014 19:34:38 +0000 (19:34 +0000)]

am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs

* commit '7823e6ee900547e32436d3c76f1709c926d08284':
Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117

commit | commitdiff | tree

RoboErik [Mon, 8 Dec 2014 19:34:32 +0000 (19:34 +0000)]

am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev

* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
Route mute key events through MediaSessionService

commit | commitdiff | tree

Quddus Chong [Mon, 8 Dec 2014 19:34:16 +0000 (19:34 +0000)]

am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs

* commit 'e6000f475346624587caa09cec37c85c3ab61ee8':
docs: Added API highlights for Google Play service v6.5 (Nacho) release.

commit | commitdiff | tree

Quddus Chong [Mon, 8 Dec 2014 19:34:08 +0000 (19:34 +0000)]

am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs

* commit 'f428952e093239bce7c11eccc547a5094066c73f':
docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.

commit | commitdiff | tree

Wale Ogunwale [Mon, 8 Dec 2014 19:34:01 +0000 (19:34 +0000)]

am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev

* commit '80d119121f62bf995ff856f6865a977eb8c03239':
Don't destroy surfaces of activities launched behind early.

commit | commitdiff | tree

Filip Gruszczynski [Mon, 8 Dec 2014 19:33:55 +0000 (19:33 +0000)]

am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev

* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
Fix calculation of overscan insets in WindowState.

commit | commitdiff | tree

Dianne Hackborn [Mon, 8 Dec 2014 19:33:49 +0000 (19:33 +0000)]

am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
Fix issue #17323751: Additional items in aggregated battery stats

commit | commitdiff | tree

ztenghui [Mon, 8 Dec 2014 19:18:13 +0000 (19:18 +0000)]

am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev

* commit '550348220e959ff3c98b88c191a849ea2ee6062a':
Fine tune the light radius from 800dp to 600dp

commit | commitdiff | tree

Sanket Padawe [Mon, 8 Dec 2014 19:17:45 +0000 (19:17 +0000)]

am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev

* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
Doing provisioning check for wifi tethering from SystemUI

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 8 Dec 2014 19:17:38 +0000 (19:17 +0000)]

am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev

* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
Camera2: Add HDR scene mode for backwards compatibility.

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 8 Dec 2014 19:17:31 +0000 (19:17 +0000)]

am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev

* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
Fix docs build

commit | commitdiff | tree

Stuart Scott [Mon, 8 Dec 2014 19:17:22 +0000 (19:17 +0000)]

am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
Add mapping between RAT and Network Mode

commit | commitdiff | tree

Jing Zhao [Mon, 8 Dec 2014 19:17:16 +0000 (19:17 +0000)]

am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature

* commit '23ad6efbf81f1ea4f1e7b24ee0ca623045063b2f':
Add checking to find AppDirectedSmsProxy for App Directed SMS feature

commit | commitdiff | tree

Chris Wren [Mon, 8 Dec 2014 19:17:09 +0000 (19:17 +0000)]

am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev

* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
Avoid race condition in heads up snooze code path.

commit | commitdiff | tree

Christopher Tate [Mon, 8 Dec 2014 19:17:00 +0000 (19:17 +0000)]

am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev

* commit '41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5':
Correctly parse previous PMBA state during backup

commit | commitdiff | tree

Christopher Tate [Mon, 8 Dec 2014 19:16:54 +0000 (19:16 +0000)]

am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev

* commit 'a42d95f1bc89dbbb4d34c62dac20ba3d9541603a':
Tune delivery and batching of alarms

commit | commitdiff | tree

Pavel Zhamaitsiak [Mon, 8 Dec 2014 19:16:43 +0000 (19:16 +0000)]

am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev

* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

commit | commitdiff | tree

Justin Harrison [Mon, 8 Dec 2014 19:16:37 +0000 (19:16 +0000)]

am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev

* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
Add UUID for Pbap client

commit | commitdiff | tree

Ihab Awad [Mon, 8 Dec 2014 19:16:31 +0000 (19:16 +0000)]

am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev

* commit '9ae44f927d678ae4b38259be2ce0601aa215e3b1':
Relax access on deprecated fields for compatibility.

commit | commitdiff | tree

Dan Sandler [Mon, 8 Dec 2014 19:16:26 +0000 (19:16 +0000)]

am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev

* commit '9e3adb821bef924cac5fb21f1e6c539495f3e831':
RTL support for Lollipop Land.

commit | commitdiff | tree

Fyodor Kupolov [Mon, 8 Dec 2014 19:16:12 +0000 (19:16 +0000)]

am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev

* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
Added isRemovingAdmin method

commit | commitdiff | tree

Amith Yamasani [Mon, 8 Dec 2014 19:16:02 +0000 (19:16 +0000)]

am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev

* commit '50734b700974bda5d955e61a8ae61e308a4dc8ad':
Correct check of is user running

commit | commitdiff | tree

Cheuksan Wang [Mon, 8 Dec 2014 19:15:57 +0000 (19:15 +0000)]

am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev

* commit '695b5d25879e894d381e95017b9ce5166adbb09f':
add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE

commit | commitdiff | tree

Amith Yamasani [Mon, 8 Dec 2014 19:15:50 +0000 (19:15 +0000)]

am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev

* commit 'b2905092d6779349834635c6343556017c0c998e':
Potential fix for accidental deactivation of profile owner