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
Greg Hackmann
dea57bac3d Revert "AlarmManagerService: remove legacy /dev/alarm support" 
This reverts commit f68cdb9cb4.

Change-Id: I13e954656771f32c6156b4c4adb52922bcd0717a
 2016-05-28 13:07:22 +00:00
Hemal Patel
300ba9cd03 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66 am: 747d945b2c am: d69a99e3a9 
am: 4b9367732f

* commit '4b9367732fcd56027fb0339f36940638caaa3480':

Change-Id: I70db5199460892c0aac57c7706bc6f7e4bf75261
 2016-05-28 01:41:11 +00:00
Hemal Patel
8d40e051f9 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66 am: 747d945b2c am: 10b673c234 
am: 398af4804b

* commit '398af4804b68a178cfba86eeed66e5eb76039f4e':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I5062070bb416ed2878284f799eb1ec225b77c993
 2016-05-28 01:35:45 +00:00
Hemal Patel
4b9367732f Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66 am: 747d945b2c 
am: d69a99e3a9

* commit 'd69a99e3a9f497fec8a2680465cf989f71962aad':

Change-Id: I4b56dfb3569488abec0be4afaf0088c6e60546f5
 2016-05-28 01:35:35 +00:00
Hemal Patel
398af4804b Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66 am: 747d945b2c 
am: 10b673c234

* commit '10b673c2345f2d2aa7b2c5983f2e18b35d694ce1':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Icf7af532b2f8eba6f22f90d178388941bd3ccd37
 2016-05-28 01:31:20 +00:00
Hemal Patel
d69a99e3a9 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66 
am: 747d945b2c

* commit '747d945b2c8717e9a501c861a3caf20633355979':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I7b701650b8ffeb97ddff0df52a2654dd88f5dffb
 2016-05-28 01:31:18 +00:00
Hemal Patel
10b673c234 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 am: 71b5005a66 
am: 747d945b2c

* commit '747d945b2c8717e9a501c861a3caf20633355979':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Ibc785405ec7100f4bfac65b1e0e71933bf3270f9
 2016-05-28 01:27:49 +00:00
Hemal Patel
747d945b2c Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs am: 709f0df0d8 
am: 71b5005a66

* commit '71b5005a66872c25aaf71be865246294d0888279':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: I09b59dd2cc85de4478012e2326bfce1cfd314e6b
 2016-05-28 01:24:52 +00:00
Jorim Jaggi
5852de4db7 Merge "Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 am: 031def9e8e" into nyc-mr1-dev-plus-aosp 
am: c1ce11f67d

* commit 'c1ce11f67d195204464aa775cc495f0796cb0ce5':

Change-Id: I24ad460bb5bdbcf4f3d48e45dc4a45f0069d3fff
 2016-05-28 01:21:00 +00:00
Jorim Jaggi
26446eb664 Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 am: cbd53dca91 
am: 5553ac4d3b

* commit '5553ac4d3b37aecaca25267849634f3812ee03ab':
  Replace Log.wtf by Log.e

Change-Id: I42fc946ffd8ee8480064295d6a34e42c940c4772
 2016-05-28 01:20:52 +00:00
Hemal Patel
71b5005a66 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs 
am: 709f0df0d8

* commit '709f0df0d883ee5351d4f5688360fa76f9a84dbc':
  Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample

Change-Id: Idee5539ed59ec115e90b4f5413f385e8d51369d8
 2016-05-28 01:20:26 +00:00
Hemal Patel
709f0df0d8 Merge "Docs: Fixed an invalid initialization of ExampleProvider member in Content URI patterns docs sample" into mnc-io-docs 2016-05-28 01:16:51 +00:00
Android Build Merger (Role)
c1ce11f67d Merge "Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 am: 031def9e8e" into nyc-mr1-dev-plus-aosp 2016-05-28 01:16:51 +00:00
Jorim Jaggi
c9fca5239f Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 
am: 031def9e8e

* commit '031def9e8e3ece07182f01ac033e745697125a6e':
  Replace Log.wtf by Log.e

Change-Id: I5079c706fad3a16117a8aab3f5a49ad1f1f27243
 2016-05-28 01:16:25 +00:00
Jorim Jaggi
5553ac4d3b Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 
am: cbd53dca91

* commit 'cbd53dca9159679a5c5ba06d9ca6e9607ca86fc4':
  Replace Log.wtf by Log.e

Change-Id: I2e039cdc9d35bcce822b85b53f05a70caec3317c
 2016-05-28 01:14:57 +00:00
Android Build Merger (Role)
b893e26ed7 Merge "Merge "Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 7317034daf" into nyc-mr1-dev-plus-aosp am: f7166bd1c8" 2016-05-28 01:12:37 +00:00
Android Build Merger (Role)
723e5dcdf0 Merge "Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 8cc9f36067 am: 6d31571950" 2016-05-28 01:12:29 +00:00
Chris Tate
b265e1e769 Merge "Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 7317034daf" into nyc-mr1-dev-plus-aosp 
am: f7166bd1c8

* commit 'f7166bd1c89101a8eaecb5a00829be267030013e':

Change-Id: I30a2a7e612e02f47b479c7efdcef914ba229da31
 2016-05-28 01:12:00 +00:00
Christopher Tate
b787a5cb6b Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 8cc9f36067 
am: 6d31571950

* commit '6d315719501341621d8d7f67a2b1dd70981c4d36':
  Don't call .toString() on potentially null CharSequence

Change-Id: I22099d2d55539af4ed13d4121296402b9596f631
 2016-05-28 01:11:57 +00:00
Doris Liu
0794f537da Merge "Copy native tree's property when mutate vector drawable" 2016-05-28 01:11:23 +00:00
Jorim Jaggi
cbd53dca91 Merge "Replace Log.wtf by Log.e" into nyc-dev 
am: be2527b964

* commit 'be2527b964796aa490f94043deedc2ad7bcd222d':
  Replace Log.wtf by Log.e

Change-Id: I6ea32ab06cf2b0584f6d0574ea7d5106e28793ee
 2016-05-28 01:08:59 +00:00
Jorim Jaggi
031def9e8e Merge "Replace Log.wtf by Log.e" into nyc-dev 
am: be2527b964

* commit 'be2527b964796aa490f94043deedc2ad7bcd222d':
  Replace Log.wtf by Log.e

Change-Id: Ifb47a055fb715852310f3ec65f38d040f29554b9
 2016-05-28 01:08:39 +00:00
Android Build Merger (Role)
f7166bd1c8 Merge "Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 7317034daf" into nyc-mr1-dev-plus-aosp 2016-05-28 01:05:20 +00:00
Chris Tate
2084fb8c10 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 
am: 7317034daf

* commit '7317034daf526553ef3ad7052d994b17820fd9e3':
  Don't call .toString() on potentially null CharSequence

Change-Id: I7a9bea266fa3748e212384165623acc561fa2a81
 2016-05-28 01:04:50 +00:00
Chris Tate
6d31571950 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 
am: 8cc9f36067

* commit '8cc9f360673ac971050d03b384a78cd2163454bc':
  Don't call .toString() on potentially null CharSequence

Change-Id: Ia30a5de830ceacf310e1573f55c206d40a679db7
 2016-05-28 01:04:37 +00:00
Jorim Jaggi
be2527b964 Merge "Replace Log.wtf by Log.e" into nyc-dev 2016-05-28 01:03:28 +00:00
Winson
e1bd3ce32d Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev am: 8a9100caae am: c58084447d 
am: 8b1f76a84a

* commit '8b1f76a84ae4831e2987a2cf05a7cfef476356cb':

Change-Id: Ie02fd302158be6c9f84a90bd6a005bfdece1cbbf
 2016-05-28 01:00:30 +00:00
Winson
11887cdafc Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev am: 8a9100caae am: 0786743a94 
am: c19b0cc90b

* commit 'c19b0cc90b52a3043af2f18cfd48966c183eaced':
  Tweaking layout to make two-task stacks to closer match design.

Change-Id: I5028ff8816699e242a366b23b3bec33a8826ee5f
 2016-05-28 01:00:28 +00:00
Makoto Onuki
6037bd076d Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev am: 8c5578bcb0 
am: fcb523502b

* commit 'fcb523502bd7799ecb5031ef777e6469590cbe34':
  Fix build breakage due to res-id changes

Change-Id: Iad52436972ce3956ec05bdb326b06e4420df14d0
 2016-05-28 01:00:25 +00:00
Doris Liu
b76f78be98 Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c am: cf9df710e5 
am: d89e9fd354

* commit 'd89e9fd354f9d89d88d35efe61f7f815dfe25065':

Change-Id: I03bc26366438669d18c8ff2d813c083cf7651507
 2016-05-28 01:00:23 +00:00
Doris Liu
b37b27ff19 Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev am: d01f474773 
am: d38541009b

* commit 'd38541009b847cba108a71a49d64d809b0bb5f42':
  Add more doc for Object animators defined with a single value

Change-Id: Icbc5a547c8a586335d4a826059765103cb59f26f
 2016-05-28 01:00:20 +00:00
Suprabh Shukla
d97d8cc0ca Merge "Adding Reset Demo Notification" into nyc-mr1-dev am: 1b9f13d7bc 
am: 6e215f895b

* commit '6e215f895beb16e822d689f179a7458611d6395a':
  Adding Reset Demo Notification

Change-Id: I18fae0829c3b3c83025e95a73d6e4cabdda1ad71
 2016-05-28 00:59:27 +00:00
smain@google.com
b11544e5e5 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51 am: 3152ead0f8 am: c26b8afd35 am: f92f6351b6 
am: a652237736

* commit 'a6522377366f03792999105e8cd30fb3f9a743ad':

Change-Id: I6c4ac736d53b4d202a9958e694d6b96653321ba0
 2016-05-28 00:59:25 +00:00
Adrian Roos
4b66c9998d Merge "Fix status bar autohide with DirectReply" into nyc-dev am: e3e80bde12 am: 2210e541bf 
am: 3340e5fad6

* commit '3340e5fad639cf23ce02548d9573cec988a5ff65':

Change-Id: If3f118d42578d9c2f19dbe6c6ed9cabbd19aad3b
 2016-05-28 00:59:23 +00:00
Joe Fernandez
72ef2f8b4a Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev am: ddb8133841 am: e6a5e9ad6b 
am: baf5f04533

* commit 'baf5f045338f90af43d1dca7b46881402042a01e':

Change-Id: I917fb0d79e8d74332dd689363b8dd8a8e3ae71c9
 2016-05-28 00:59:21 +00:00
Jeremy Joslin
c9a199c15d Merge "Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 am: 0b6676d7bc" into nyc-mr1-dev-plus-aosp 
am: ebbe6e702b

* commit 'ebbe6e702bf885779684af582121a47afe7f9fec':

Change-Id: I8052eb544b037a2210f47b5ce09ab879022b1519
 2016-05-28 00:59:19 +00:00
Christopher Tate
7317034daf Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev 
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I5c8253739fa06b07abd4d67b4947c6bed153d010
 2016-05-28 00:57:43 +00:00
Christopher Tate
8cc9f36067 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev 
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I7242f7f064f6695956a9b529f38c2ece82effbcb
 2016-05-28 00:57:39 +00:00
Hang Yin
c2eaa3da11 Merge "Merge "Code Patch for camera preview switch tests" into nyc-dev am: 5c950a8078 am: e6880cbef9" into nyc-mr1-dev-plus-aosp 
am: dee676b3f9

* commit 'dee676b3f95639963ed5dced5b725c7afd5d30f4':

Change-Id: I0322cd6638c18c71be8a050a2cf0578d03e30ff2
 2016-05-28 00:53:11 +00:00
Doris Liu
512cfdbf83 Merge "Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev am: fceaa60e24 am: fe0a4e4189" into nyc-mr1-dev-plus-aosp 
am: 841aa5fb03

* commit '841aa5fb0390c8690526a6a07cad70dcbbd4b9fa':

Change-Id: Ic23c40794dc2b86fa153bbbe7e662364c8249e04
 2016-05-28 00:53:08 +00:00
Adrian Roos
aa729b6760 Merge "Merge "Change app crash dialog strings" into nyc-dev am: a7d66aa6b8 am: b87023903e" into nyc-mr1-dev-plus-aosp 
am: 0a98887f25

* commit '0a98887f25bad91f7cd423784ac74bda0c0b3b82':

Change-Id: Idd36a8c2a308374ee41958047c8a2c35849c9a99
 2016-05-28 00:53:05 +00:00
Adrian Roos
b0439610ac Merge "Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 am: b1ca71dc16" into nyc-mr1-dev-plus-aosp 
am: 4dc61a31fc

* commit '4dc61a31fc02aadbb05909f184cb3575e4f6b648':

Change-Id: I0176738fc7fe6ea3645ecd093abd0e8001c9d1b2
 2016-05-28 00:53:01 +00:00
smain@google.com
e68b46369b Merge "redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51 am: 3152ead0f8 am: c26b8afd35 am: 6d6e6d2457" into nyc-mr1-dev-plus-aosp 
am: 8f69279e5a

* commit '8f69279e5a6ba82fb5a46c553d9ec248d0f33c81':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I33d52d6c1f3e70f89f849cc782efb1be1e386734
 2016-05-28 00:52:55 +00:00
Annie Chin
1ea49352cb Introduce ButtonInterface and getHomeId() 
Bug: 28957690

Change-Id: Ief61d63b5358d07a6feb222a379a7e8cdcd712b2
 2016-05-27 17:52:14 -07:00
Chris Tate
b182735757 Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev 2016-05-28 00:52:11 +00:00
Adrian Roos
a9bbec7612 Merge "Merge "Fix status bar autohide with DirectReply" into nyc-dev am: e3e80bde12 am: 9fb91a6c04" into nyc-mr1-dev-plus-aosp 
am: d29ac4b966

* commit 'd29ac4b966b74dafb334d6f6c0a92deed239af54':
  Fix status bar autohide with DirectReply

Change-Id: I117486b2b3f710ad97cdc0d3ad5e7c64fd155ebd
 2016-05-28 00:50:54 +00:00
Adrian Roos
6b904b4457 Merge "Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 5dbb9ff674 am: 7d4da18d03" into nyc-mr1-dev-plus-aosp 
am: 3b1e450281

* commit '3b1e450281c2bf3ebfed770fa0dd5d3a659dbf78':

Change-Id: I3f78f48f53e0844b45d5fe300e4c5c11e652afad
 2016-05-28 00:50:52 +00:00
Joe Fernandez
8ec8d7c739 Merge "Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev am: ddb8133841 am: f6ccafda22" into nyc-mr1-dev-plus-aosp 
am: dea953615d

* commit 'dea953615d1ed20806a9b99cd3e3a1a24770029d':
  docs: update redirects for GMS and GCM reference docs

Change-Id: Ie6e79b99047083b65ac87363039f7e607a77313f
 2016-05-28 00:50:49 +00:00
Adrian Roos
5d88bddca2 Merge "Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 2c69d1ecae am: f986b700de" into nyc-mr1-dev-plus-aosp 
am: 2ce41e61a6

* commit '2ce41e61a6067d5a80c78c1948e50abb36da4d0b':

Change-Id: Ia2da22ee899482f32589b8944bfbf056e0358d3a
 2016-05-28 00:50:47 +00:00
Jeremy Joslin
c0580d653a Merge "Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 am: b17d1a36fb" into nyc-mr1-dev-plus-aosp 
am: 4a923e9d49

* commit '4a923e9d490733e2f08cb97ad97a8d91a4e99b4f':
  Fix issue #28930592: Scoring service binding is not reestablished.

Change-Id: I65d8d588ad24f2239ed2e26d7cb4c390240e6dff
 2016-05-28 00:50:44 +00:00