Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
e96afc7bc2 Merge "Fix documentation for channel types" into nyc-dev 
am: cf7b33426e

* commit 'cf7b33426e6db0abab94895c3c89c76869f0a8c6':
  Fix documentation for channel types

Change-Id: I4d70f850761d639d4f9ceeff1fe3d33483267415
 2016-06-02 00:10:33 +00:00
Philip P. Moltmann
76fb4412b7 Merge "Use text input to deal with fullscreen IME" into nyc-dev 
am: ddf5c44567

* commit 'ddf5c445673bab848b3d9c8af4de8978daf9b56b':
  Use text input to deal with fullscreen IME

Change-Id: I0aadae2eac2b0bbf81658525aeda70ca2512337c
 2016-06-02 00:10:26 +00:00
Philip P. Moltmann
41996ea784 Merge "Use text input to deal with fullscreen IME" into nyc-dev am: ddf5c44567 
am: 75300f64e7

* commit '75300f64e7db8f5a26ecfb0e373de5d01f245103':
  Use text input to deal with fullscreen IME

Change-Id: I4bc72f296be562b2f162c375dc90ac7b023e473c
 2016-06-02 00:10:24 +00:00
Lajos Molnar
2d22b6709d Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e 
am: 3d41fc67c0

* commit '3d41fc67c0f44c055cd6d1fc1063bb8ef46205e8':

Change-Id: I489dd5ca7e54466c596f154135e2aa228da354c0
 2016-06-02 00:10:18 +00:00
Philip P. Moltmann
75300f64e7 Merge "Use text input to deal with fullscreen IME" into nyc-dev 
am: ddf5c44567

* commit 'ddf5c445673bab848b3d9c8af4de8978daf9b56b':
  Use text input to deal with fullscreen IME

Change-Id: I5fc7ddf35ce6696824558029f09f8e7cd9ac6fbd
 2016-06-02 00:05:44 +00:00
Jae Seo
bd2b9e0d53 Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev 2016-06-02 00:04:17 +00:00
Jae Seo
cf7b33426e Merge "Fix documentation for channel types" into nyc-dev 2016-06-02 00:03:53 +00:00
Lajos Molnar
d1991f03de Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e 
am: 12273862c3

* commit '12273862c3530d261ddb92ce087c4be9751de48d':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I6f0c0b97a027998a22cba5109ecc70f53cba6ea9
 2016-06-02 00:00:30 +00:00
Philip P. Moltmann
ddf5c44567 Merge "Use text input to deal with fullscreen IME" into nyc-dev 2016-06-01 23:57:20 +00:00
sergeyv
ab3f8c2e32 HWUI: do not call glCopyTexSubImage2D on empty area. 
Previous check .isEmpty() is not sufficient, because getWidth() may have
value 0.5, so technically it is not empty, but when this size is passed
to texture calls it is converted to uint_32 and it becomes zero.

bug:28941093
Change-Id: Ia7c2bf0340466d5376f235fb5da54ad2ddfa0a03
 2016-06-01 23:55:32 +00:00
Adrian Roos
3a866db8a1 Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 62eb79e6c8" into nyc-mr1-dev-plus-aosp 
am: 0eb85b9d7c

* commit '0eb85b9d7cbac4122fb56a60b8ace2f0913536d9':
  AppError: Change "close" to "close app"

Change-Id: I29f2ce210d661c95373b0f754d8205facfe9b79e
 2016-06-01 23:48:55 +00:00
Kevin Hufnagle
86db54af75 Merge "cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 8b1df8f382" into nyc-mr1-dev-plus-aosp 
am: 5735a69ac3

* commit '5735a69ac3468df2626328837188517b25b7bdee':

Change-Id: I5b832528fb09cabc4904f1ba556252d376e76073
 2016-06-01 23:48:48 +00:00
Kevin Hufnagle
7ecce249e6 cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 810913f943 
am: f6aa0d6612

* commit 'f6aa0d6612a445b1a08d46cc5a1aa61ab14da288':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Icf548dbba69697d93c377401351515695cc0dff3
 2016-06-01 23:48:40 +00:00
Julia Reynolds
a4b22aa11a Merge "Radio buttons belong in a radio group." into nyc-dev am: d05a7b5972 am: 9eaa3bc7a8 
am: bf1c605842

* commit 'bf1c605842a929f7f2203f4c40cf3a81f10abbb6':

Change-Id: Ia823a148b9845d426f023f494e63819f1ec3e507
 2016-06-01 23:48:35 +00:00
Ian Rogers
7dbb000ed3 Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0 am: ecc799a076 
am: 005592ee0a

* commit '005592ee0a6100d4d5d89eb40e1dc4664fce052c':

Change-Id: I3da4e31ae378b3fcd87cae5129f9433f64bf5aeb
 2016-06-01 23:48:26 +00:00
Jason Monk
152445b566 Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 am: 937e0e3e61 
am: c0e262447e

* commit 'c0e262447e19573e45dc2d598975340f63bfff03':

Change-Id: I57b7527ea273819021fef5feb95f96227e2eac1b
 2016-06-01 23:45:25 +00:00
Jason Monk
99526fb33f Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa am: 13edc468d6 
am: aa63a64aae

* commit 'aa63a64aae8f85486a27fb2e2aa6a017a945ada8':

Change-Id: Ibffb47a4d7d369b0f38a421dd20ad7e9f9048fe2
 2016-06-01 23:45:02 +00:00
Julia Reynolds
4ae8b76993 Merge "Radio buttons belong in a radio group." into nyc-dev am: d05a7b5972 am: 88470b5ba2 
am: cdfba342b0

* commit 'cdfba342b0b1ab00ccba9c6c1058a9ce925300b1':
  Radio buttons belong in a radio group.

Change-Id: Iee1829ccb90a43a2e4f3fa60d0d23c1efea46308
 2016-06-01 23:44:35 +00:00
Android Build Merger (Role)
13205c022b Merge "Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a am: 67d9f72659" into nyc-mr1-dev-plus-aosp 2016-06-01 23:44:16 +00:00
Lajos Molnar
12273862c3 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
 2016-06-01 23:44:12 +00:00
Ian Rogers
65b2b2c4ef Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0 am: e3cac08ec6 
am: 689b6c4052

* commit '689b6c4052801beca234e1f496795098ce7abe7f':
  Fix call to equals that could never succeed.

Change-Id: I9603c162e3f0b002be595636d2a007fe3e2b3b68
 2016-06-01 23:44:12 +00:00
Lajos Molnar
3d41fc67c0 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I04a42c8f40c8802eeba3ca9e2acc9ef87d4be403
 2016-06-01 23:44:11 +00:00
Android Build Merger (Role)
40ac62d0fa Merge "Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev am: a48f9cb72f" into nyc-mr1-dev-plus-aosp 2016-06-01 23:43:57 +00:00
Jason Monk
5dbe4afebe Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 am: 023b338111 
am: e5b5c11743

* commit 'e5b5c11743f53d70dda78d7fd4f8a728a3c1bc3c':
  QS: Fix single expanded frame from layout

Change-Id: If4e5828a662d2d326e447f31f36ecea5a6280a19
 2016-06-01 23:43:51 +00:00
Android Build Merger (Role)
540510b7f4 Merge "Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 am: 82c9562d3c am: 4137a97b30" into nyc-mr1-dev-plus-aosp 2016-06-01 23:43:43 +00:00
Android Build Merger (Role)
73c7c63f1f Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: 2855609944" into nyc-mr1-dev-plus-aosp 2016-06-01 23:43:34 +00:00
Jeff Sharkey
7f24037947 Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a 
am: 67d9f72659

* commit '67d9f726593d7b7e0cc0c6ba1e4296614e5f67b7':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: Ic44db23ff7792a7d38e430b72f10bfd9ea922630
 2016-06-01 23:42:32 +00:00
Annie Chin
f11218183c Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev 
am: a48f9cb72f

* commit 'a48f9cb72f062ede5ed5d9ceb6fa345f5b194d1b':
  Add createAssistManager() method to SystemUIFactory

Change-Id: I9551ceff98c3e238c72c158e4ab23a6bc65559c4
 2016-06-01 23:40:30 +00:00
Sreevani Sreejith
ae71a96507 Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 am: 82c9562d3c 
am: 4137a97b30

* commit '4137a97b3004a46f56d97a90f962f1fa519472ff':

Change-Id: I5fe977bd1dfcefd48a7ec048df5a855e0b8f4c63
 2016-06-01 23:40:12 +00:00
David Sehr
79e4cedca7 Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a 
am: 2855609944

* commit '2855609944f0683efec2985f88ee167c9b7941d9':

Change-Id: I8e6826d3e0692eed0a9d444db500119a641e92eb
 2016-06-01 23:40:05 +00:00
Jason Monk
9882301826 Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa am: 947ef9a717 
am: 1487a07ad4

* commit '1487a07ad4f0bbd1e08c63089f7337eb1e0892b4':
  QS: Followup to scroll fixes

Change-Id: I7612dcd819e5a3c250d5f10b4af85cfce860fbef
 2016-06-01 23:39:53 +00:00
Narayan Kamath
45d8e368ee Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: d579be0cf2 am: 0c4f066f0b 
am: cf2f199cfb

* commit 'cf2f199cfb4d545c3d768f990e3b66d1ea83e16a':

Change-Id: Ifbae80dcefe604f27bb180a28246dc6e49ade01c
 2016-06-01 23:39:48 +00:00
Robert Shih
d748cf6ff3 resolve merge conflicts of d579be0 to nyc-dev-plus-aosp am: 4c3d43d2c2 
am: e188177c21

* commit 'e188177c21e65545cb29c972a0fe06457669512a':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: Id7017b8cc3352cf2ee5f3f6c8590cda97c373a99
 2016-06-01 23:39:39 +00:00
Robert Greenwalt
98901e8a01 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e am: ce82f1c16a am: be718d8836 
am: 45fea4d6e9

* commit '45fea4d6e9732d12fcc63243c678c405d7efae40':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Ib722fb929db6fba58b6c6aa6017b444742efec6e
 2016-06-01 23:39:32 +00:00
Brian Carlstrom
2366e05921 Merge "Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: 93193135b1 am: 93a01103af" into nyc-mr1-dev-plus-aosp 
am: 06aae68d82

* commit '06aae68d828b4a93a1e2ce61277841241022a908':

Change-Id: I0a8092c112d59ac1fa989076f0be4323120cd001
 2016-06-01 23:39:27 +00:00
Jeff Sharkey
2383d08b82 Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a 
am: cc80f0a955

* commit 'cc80f0a955812a903ddb0dd3c7e0b54cacdf30b9':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: I66e3af5f084adf6c03a972c37e8c870be2265092
 2016-06-01 23:39:24 +00:00
Jeff Sharkey
5ec2c4aeb7 Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 
am: f02954ccd5

* commit 'f02954ccd5f536577fa4564ede76c5ec61fbbf88':

Change-Id: I1f5b24cd5d08a512e65ef428e03e6033c55896da
 2016-06-01 23:32:34 +00:00
Makoto Onuki
facbcba617 Merge "ShortcutManager: API rename" into nyc-mr1-dev 
am: 60585d12e7

* commit '60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
  ShortcutManager: API rename

Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
 2016-06-01 23:32:22 +00:00
Chia-I Wu
2c63aef816 Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d604 
am: aa53fde78e

* commit 'aa53fde78e3c7d8e0794587e58b2c5d32567aa39':

Change-Id: Ie481ce0a44ccdd4b1521983a5b2ca6238e8825aa
 2016-06-01 23:32:13 +00:00
Alex Klyubin
7df666da5f Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf 
am: 5a347de60f

* commit '5a347de60fc2c34bcf2b50f9363715e2f1e092f7':

Change-Id: Ib71c8fd0f288113d154d31afb7e3f3182b108685
 2016-06-01 23:32:04 +00:00
TreeHugger Robot
9061b26f1e Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 2016-06-01 23:29:49 +00:00
Jeff Sharkey
67d9f72659 Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev 
am: 9bdf289f0a

* commit '9bdf289f0a1874d151684497cb3acd8f96fbd58d':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: I70e69653da834c1ef0e8160cb75826043fffe9e6
 2016-06-01 23:28:06 +00:00
Jeff Sharkey
cc80f0a955 Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev 
am: 9bdf289f0a

* commit '9bdf289f0a1874d151684497cb3acd8f96fbd58d':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: I50f93b3e867140199f1de253f283c220c1df211e
 2016-06-01 23:27:00 +00:00
Ta-wei Yen
cbf3aa8789 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev 
am: 912e2b2c80

* commit '912e2b2c80ba7641f649ae7e130d9febc4caac44':
  Add support for source-specific VVM state in VoicemailContract

Change-Id: I0d0555fc9d2d4dfcee9a8cfb29acfe3a109be094
 2016-06-01 23:26:31 +00:00
Jason Monk
2854e4148d Merge "Merge "QS: Only put visible tiles in listening state" into nyc-dev am: 8768f68713 am: ae42c4a118" into nyc-mr1-dev-plus-aosp 
am: 85ddd0be68

* commit '85ddd0be688fec19b4c0ef5286fceac6e20d3ff0':

Change-Id: I011c03dd8b8428c014952f734d7a5722a92122dd
 2016-06-01 23:19:18 +00:00
Jason Monk
b4a6ad5a75 Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 am: 2891acd139" into nyc-mr1-dev-plus-aosp 
am: 3f41ed9f3f

* commit '3f41ed9f3f2c380fefd950101dc37820cc39c6e7':

Change-Id: I8d9f7eb67bbd140c2d23458a12bcb871e33dc0b3
 2016-06-01 23:19:09 +00:00
Adrian Roos
15ad086a4c Merge "Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: adc3f1ec2b" into nyc-mr1-dev-plus-aosp 
am: f1b2350330

* commit 'f1b23503302767c2f548e797948cf632f1ffec34':

Change-Id: I30d4a288316eabb0c22c66ad85784b1306fdbf04
 2016-06-01 23:18:59 +00:00
Narayan Kamath
1a723ec551 Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: 93193135b1 am: 41846b0612 
am: eaa8b0fcfb

* commit 'eaa8b0fcfb9ca5a222946e5873297f5a497fc9da':
  PackageManager: Don't clear app profiles during system upgrades.

Change-Id: Iae746cbeccf451f55d3710669c20caf454972093
 2016-06-01 23:18:42 +00:00
Jason Monk
ace52b50cb Merge "QS: Only put visible tiles in listening state" into nyc-dev am: 8768f68713 am: e696c8465b 
am: 7bd7318b8f  -s ours

* commit '7bd7318b8f5888dbad16dd8bdbcc14324d4f6adc':
  QS: Only put visible tiles in listening state

Change-Id: I0f3024bfd3317b5eee8c57d1f9e8e730780c539c
 2016-06-01 23:18:27 +00:00
Android Build Merger (Role)
7208412352 Merge "Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 am: 82c9562d3c am: 9fc3d3deeb" into nyc-mr1-dev-plus-aosp 2016-06-01 23:17:11 +00:00