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
Chia-I Wu
0c63355719 Merge "Fix clipRect transform rounding errors" into nyc-dev 
am: 2957d9d604

* commit '2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
  Fix clipRect transform rounding errors

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

* commit '82c9562d3c35df6569fcb04e7cd999fdc11d5d99':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I5642adf704dec6f6c8522d638504da68c0a80bb0
 2016-06-01 23:03:58 +00:00
Alex Klyubin
815c681f42 Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev 
am: 7fe19060cf

* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: I5f93eac591446733fe7188e149ad5c4d970a1ba3
 2016-06-01 23:03:51 +00:00
David Sehr
2855609944 Merge "Installer connection support for dump_profiles" into nyc-dev 
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
 2016-06-01 23:03:50 +00:00
Jeff Sharkey
f02954ccd5 Merge "Release AssetManagers when ejecting storage." into nyc-dev 
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
 2016-06-01 23:03:38 +00:00
Felipe Leme
84c784b49a Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a 
am: d116e0fc14

* commit 'd116e0fc1447470a1d7ca1d6f25f56b4e598f996':
  Move DownloadsManager to permanent whitelist.

Change-Id: Icbe617b4a5f894930b15923fe2a104d1957bb17a
 2016-06-01 23:02:47 +00:00
Jorim Jaggi
b4e81ff4c3 Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 
am: 859465c105

* commit '859465c105215cc7d0e152ad2280419c4f820598':
  Don't crash activity manager when supplying invalid URI

Change-Id: I0e7a036384d4e30a6bfedcefb3eb18774a55538d
 2016-06-01 23:02:11 +00:00
Eric Schmidt
8424925f7d Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b 
am: 65436b097a

* commit '65436b097a9e513d8628ed3cfa187de226a75efb':
  docs: Fixed 'MessageStyle' typo

Change-Id: If678f140004aa846bc83c2a2aefbfd428dc9123d
 2016-06-01 23:02:01 +00:00
Adrian Roos
d38b5a350b Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf 
am: 62eb79e6c8

* commit '62eb79e6c80960636982d056c89b97a0c95d9987':
  AppError: Change "close" to "close app"

Change-Id: Ib622156c3af13a6cec611f2613f0729b839ed3db
 2016-06-01 23:01:55 +00:00
Kevin Hufnagle
8315cf49ec cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae 
am: 8b1df8f382

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

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

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

Change-Id: Ia16f73bf25261d7ea842c6b615dcc9c04ffe06a6
 2016-06-01 22:56:38 +00:00
Julia Reynolds
bf1c605842 Merge "Radio buttons belong in a radio group." into nyc-dev am: d05a7b5972 
am: 9eaa3bc7a8

* commit '9eaa3bc7a806081d0bfc39cae0e61dbce581da54':

Change-Id: I0f33d6db53ffa344e3a25b42a402c39fad2c12fb
 2016-06-01 22:56:34 +00:00
Ian Rogers
005592ee0a Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0 
am: ecc799a076

* commit 'ecc799a0761f60237bcd6da516e32a28f5951b5a':

Change-Id: If26f115ccd0661536afced9165fcc149d62d3946
 2016-06-01 22:56:30 +00:00
Jason Monk
c0e262447e Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 
am: 937e0e3e61

* commit '937e0e3e61dcf9cef1de92d6fb80bb5491f88489':

Change-Id: I0d6d2ae4b6f2ca962c55eccdacb4ec17df00ff77
 2016-06-01 22:56:25 +00:00
Jason Monk
aa63a64aae Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa 
am: 13edc468d6

* commit '13edc468d6ac2a8ac2ccafcd06053af883a248f6':

Change-Id: I2ca7c1e8739e218cae4336039f43fd829ed39906
 2016-06-01 22:56:20 +00:00
Sreevani Sreejith
82c9562d3c Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b 
am: 441209abc7

* commit '441209abc78b8c6bcbcc6b1eb08d2f41219ce344':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I761a39db759030d4f07cb6e77326fc45db215677
 2016-06-01 22:54:06 +00:00
Julia Reynolds
cdfba342b0 Merge "Radio buttons belong in a radio group." into nyc-dev am: d05a7b5972 
am: 88470b5ba2

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

Change-Id: I17cbb329efa9cb1fc7a3a229cd523ce0abab852f
 2016-06-01 22:52:08 +00:00
Ian Rogers
689b6c4052 Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0 
am: e3cac08ec6

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

Change-Id: I5fa03a7d9cfa6e3c8ef2feb04838df3023b7aaae
 2016-06-01 22:52:02 +00:00
Jason Monk
e5b5c11743 Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 
am: 023b338111

* commit '023b338111191c62cb5ba6b4a3394fe039c0888e':
  QS: Fix single expanded frame from layout

Change-Id: I3e2035596f207b7ed82973af91470ca981bb65ef
 2016-06-01 22:51:56 +00:00
Jason Monk
1487a07ad4 Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa 
am: 947ef9a717

* commit '947ef9a7171fa0750cf3c027a2cb487f827cff06':
  QS: Followup to scroll fixes

Change-Id: I62212b21a330db50aaa8a2923bf753e980f931cf
 2016-06-01 22:51:49 +00:00
Robert Shih
cf2f199cfb Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: d579be0cf2 
am: 0c4f066f0b

* commit '0c4f066f0b043e6b2678840a7da1db2714abd2d9':

Change-Id: I80d858b02b023abae4e1aa79f8a2bd5040073738
 2016-06-01 22:51:43 +00:00
Julia Reynolds
e24e9a0333 Merge "Only call finish on operations that have started." into nyc-dev 
am: 6df8a9a89f

* commit '6df8a9a89fc87649595926592bf895768c861b68':
  Only call finish on operations that have started.

Change-Id: I7e9d30640800ace35a19f17d327b1db6ece42edf
 2016-06-01 22:49:18 +00:00
Adrian Roos
053ffa6d7c Merge "Fix DirectReply bug when reapply fails" into nyc-dev 
am: 6510bdeada

* commit '6510bdeada8b670b1c9863fdb7b518e161105c09':
  Fix DirectReply bug when reapply fails

Change-Id: Ie4b164d285b25ab359b087e7d002c4cdf97dd3ee
 2016-06-01 22:49:13 +00:00
Chong Zhang
47797a7653 Merge "Do not sanitize override config for fullscreen" into nyc-dev 
am: 65f1973ba9

* commit '65f1973ba9f91c6727a7131b31b6c563cd880ee0':
  Do not sanitize override config for fullscreen

Change-Id: Ic9c62b12f529e17c39ac7f466433cb30cb13f356
 2016-06-01 22:49:08 +00:00
Dianne Hackborn
56b70d51f4 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev 
am: 61721ee3d7

* commit '61721ee3d7b7d55a0535584449b49143b1c2e039':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I3f05621c5e18ca35104ac66f95a96a19c789612d
 2016-06-01 22:48:59 +00:00
Dianne Hackborn
0acb155338 Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev 
am: 3e05055af7

* commit '3e05055af775f9539d832b1191ae2ee9bc4acf21':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I8e472de1aca491dabd1bd2bfc456560fabc16221
 2016-06-01 22:48:52 +00:00
sreevanis
441209abc7 Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs 
am: 2d6015b18b

* commit '2d6015b18ba0bf52ebe402503c7c66ddae23d8bd':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: I76168738a10e3f379134a88a89667a63d818323d
 2016-06-01 22:46:44 +00:00
Selim Cinek
7b7b17ab80 Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev 
am: 42621023cf

* commit '42621023cfac084b8c74fd4d362bc2c64d61674e':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: Ic871ddca73896db588ca8436c2aea92c50eb37aa
 2016-06-01 22:45:59 +00:00
Felipe Leme
9a1dfc9dab Merge "Move DownloadsManager to permanent whitelist." into nyc-dev 
am: 31e3b14d6a

* commit '31e3b14d6a613934a8c44223fd77aff2ecc5c5a5':
  Move DownloadsManager to permanent whitelist.

Change-Id: I2d36bc51ff244a0890824e376602f22baa0c4b7b
 2016-06-01 22:45:33 +00:00
Jorim Jaggi
a036c209db Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev 
am: 13d534e7f2

* commit '13d534e7f2419219e3e26e582b1f6f5ae79be408':
  Don't crash activity manager when supplying invalid URI

Change-Id: Iddb17cdf953668ad8bfae6a54a5eb9141ec12ad2
 2016-06-01 22:45:20 +00:00
Eric Schmidt
7ed7f324f6 Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a 
am: 28ed18877b

* commit '28ed18877bc9cc040e8cea678f7a7782426c1dc9':
  docs: Fixed 'MessageStyle' typo

Change-Id: Iff30a4c4e9c9b45939d780aebe34ac74bdfb5f8d
 2016-06-01 22:44:58 +00:00
Adrian Roos
2bad55cb1b Merge "AppError: Change "close" to "close app"" into nyc-dev 
am: b4cd4650cf

* commit 'b4cd4650cfd634df75e9e23f9585a756823bd012':
  AppError: Change "close" to "close app"

Change-Id: If2879efeaf2c3b4bd6112a22d81b59e32acbbc13
 2016-06-01 22:44:44 +00:00
Makoto Onuki
60585d12e7 Merge "ShortcutManager: API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Chia-I Wu
aa53fde78e Merge "Fix clipRect transform rounding errors" into nyc-dev 
am: 2957d9d604

* commit '2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
  Fix clipRect transform rounding errors

Change-Id: I61a04e944d607f2271f5184de7504ed04867ef7f
 2016-06-01 22:31:01 +00:00
Alex Klyubin
5a347de60f Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev 
am: 7fe19060cf

* commit '7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: Ieb7d6d212fe26ffa61aa6714ed8315b2c98bfe3d
 2016-06-01 22:29:49 +00:00
Kevin Hufnagle
810913f943 cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 
am: b04f86acae

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

Change-Id: Id5b9ffebcafb4035b6d330e9aae0d65a09a282e2
 2016-06-01 22:26:19 +00:00
Julia Reynolds
9eaa3bc7a8 Merge "Radio buttons belong in a radio group." into nyc-dev 
am: d05a7b5972

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

Change-Id: Ia5b4cd5135fb78ccf98f1b05e63fafc7a04349d8
 2016-06-01 22:24:21 +00:00
Ian Rogers
ecc799a076 Merge "Fix call to equals that could never succeed." into nyc-dev 
am: 748620e9f0

* commit '748620e9f03dd66bfed38d91d32b35d79684173b':
  Fix call to equals that could never succeed.

Change-Id: I27b594ae75430b5cb9fe3bc905461b547ba5841c
 2016-06-01 22:20:47 +00:00
Jason Monk
937e0e3e61 Merge "QS: Fix single expanded frame from layout" into nyc-dev 
am: 4215ae0100

* commit '4215ae01002f1217587698d24636870ace4a50f5':
  QS: Fix single expanded frame from layout

Change-Id: I49972e1a12bf6eeec91e845550c81a7eb41a0ecc
 2016-06-01 22:20:22 +00:00
Jason Monk
13edc468d6 Merge "QS: Followup to scroll fixes" into nyc-dev 
am: 1ceef7c0fa

* commit '1ceef7c0fab15af522f56ade3e08abf559622181':
  QS: Followup to scroll fixes

Change-Id: I7a0a3962cd1efef365787cb25aa70b77c6b403bf
 2016-06-01 22:20:16 +00:00
Robert Shih
e188177c21 resolve merge conflicts of d579be0 to nyc-dev-plus-aosp 
am: 4c3d43d2c2

* commit '4c3d43d2c2ef9f9176fae6d897d01ec57e3970cd':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: I8e0bfa7f23437ba3fe75283d6020b446ea82d55c
 2016-06-01 22:18:00 +00:00
David Sehr
7c5bcfc21a Merge "Installer connection support for dump_profiles" into nyc-dev 2016-06-01 22:16:05 +00:00
TreeHugger Robot
380f3b12a4 Merge "Release AssetManagers when ejecting storage." into nyc-dev 2016-06-01 22:14:57 +00:00
TreeHugger Robot
185037ecfa Merge "sysui: refactor for extension." 2016-06-01 22:12:35 +00:00
Chia-I Wu
2957d9d604 Merge "Fix clipRect transform rounding errors" into nyc-dev 2016-06-01 22:11:39 +00:00
Philip P. Moltmann
9f87935b2e Use text input to deal with fullscreen IME 
The full screen "number" keyboard strips all non-numeric letters
out of the text field.

Bug: 29004437
Change-Id: Ic7e79106a7fcf0716a28061592221557b9d62f52
 2016-06-01 22:08:13 +00:00
John Reck
779b2f54ad Fix the instrumentation report issue 
b/28980976

Change-Id: Ic5f9ce87569b9c5aff346017e4a8562eddf7182a
 2016-06-01 15:03:51 -07:00
Sreevani Sreejith
2d6015b18b Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs 2016-06-01 21:58:22 +00:00
Doris Liu
ec30e5b233 Merge "Correct valueType attribute for an AVD in test app" 2016-06-01 21:56:35 +00:00
Alex Klyubin
7fe19060cf Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev 2016-06-01 21:55:05 +00:00