drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,631 Commits 1 Branch 0 Tags
Commit Graph

177631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andre Eisenbach
0fd06a19bd Prevent NullPointerException in getStringValue if no value is set 
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
 2014-12-09 16:42:14 -08:00
Amith Yamasani
f1ffc75c9e Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 
automerge: 7acd880

* commit '7acd8802d7c14323dfc2a5e68b1d2a82f9d3f5c0':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:35:52 +00:00
Amith Yamasani
7acd8802d7 Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 
automerge: dad85a6

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:33:24 +00:00
Amith Yamasani
dad85a6c4b Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 2014-12-10 00:30:31 +00:00
Wale Ogunwale
c73923bcf9 Merge "Always take an activity screenshot when pausing." 2014-12-10 00:09:15 +00:00
Quddus Chong
09e72628fc Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 2014-12-10 00:02:17 +00:00
Michael Wright
584674c39d am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 
automerge: 422db53

* commit '422db53f8cf2fc69cdf892cb42f33021f510f207':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-10 00:01:23 +00:00
Jeff Sharkey
236dc2c81d am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 
automerge: 8650c35

* commit '8650c358fb44b943dd74751742333bf1cebf7b8e':
  Throw IOException when missing default ringtone.
 2014-12-09 23:59:58 +00:00
Joe Fernandez
41a635e083 am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge: d36d2aa 
automerge: 509815b

* commit '509815b8a7059fbe67bd44c0b071a1e96977ce60':
  :docs studio tips and tricks headings updates
 2014-12-09 23:58:36 +00:00
Derek Sollenberger
8386aee175 am 1f78b336: am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev 
* commit '1f78b3364f0e39db912d898187bed0195d9319cd':
  Remove unnecessary/erroneous reference counting
 2014-12-09 23:49:27 +00:00
John Reck
af878b91f9 am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
  Fix issue with RNA destruction mid-animation
 2014-12-09 23:49:22 +00:00
Jason Monk
dc6b35f54e am 3c8e51ab: am 7940f55c: am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 
* commit '3c8e51ab8dd0b9fb58c3c64768576841dbce4c3e':
  Push inet condition to new MobileSignalControllers
 2014-12-09 23:49:09 +00:00
Pavel Zhamaitsiak
fd3090aefb am 8bd0b516: am bf7b4d94: am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit '8bd0b516751df764b9c47fa64e31d7125e0942f0':
  Added configuration to determine whether VoLTE requires provisioning.
 2014-12-09 23:49:05 +00:00
Pavel Zhamaitsiak
1263d0cd39 am 6549e9be: am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev 
* commit '6549e9be44d2370b624079c0a8ead95c9588afb7':
  IMS: change getMasterValue to getProvisionedValue.
 2014-12-09 23:49:00 +00:00
Pavel Zhamaitsiak
4ef46266d3 am 863fb4dd: am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev 
* commit '863fb4ddcac01849b66025e202302b8e1431d7e9':
  IMS: add ImsConfig api to get volte provisioned value.
 2014-12-09 23:48:55 +00:00
Selim Cinek
558eb39f0f am 90c4a299: am e2389908: am 24232396: Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev 
* commit '90c4a299a879c7f996b4b882d48b8be61263417f':
  Fixed accessibility for the pin input view on keyguard.
 2014-12-09 23:48:35 +00:00
Adrian Roos
c3c22399bc am 4816e1c5: am a7065ea3: am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 
* commit '4816e1c51922b10a2fea9087c858aff4a117d89b':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
 2014-12-09 23:48:26 +00:00
Adrian Roos
0b85b9d267 am 9c69c319: am 87427ce5: am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 
* commit '9c69c3199637d33d2db754f53a3f3161b7df7153':
  Revert "Fix calculation of overscan insets in WindowState."
 2014-12-09 23:48:16 +00:00
Alan Viverette
f1d6706fb4 am c5d71c67: am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s one shot property" into lmp-mr1-dev 
* commit 'c5d71c67dfbcd0d80ee1fa453e027ea642542fc3':
  Fix default value of AnimationDrawable's one shot property
 2014-12-09 23:47:27 +00:00
Wink Saville
189c180857 am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 23:47:19 +00:00
Jeff Sharkey
1ca0ea6b7c am b97633c1: am 5d662a82: am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev 
* commit 'b97633c14da555d89dac7eadbf6e351d82281614':
  Consistent result when signatures don't match.
 2014-12-09 23:46:59 +00:00
Craig Mautner
0360f2a158 am 40c5c0ef: am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked." 
* commit '40c5c0ef16462668fb13717f59254f8696eac127':
  [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
 2014-12-09 23:46:49 +00:00
Elliott Hughes
de472a53ac am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo." 
* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
  Fix typo.
 2014-12-09 23:46:44 +00:00
Jorim Jaggi
4b89a3245d am 6c0c349f: am bd6aff3b: am 9ba89ad8: Merge "Make hint text centerred if multiline" into lmp-mr1-dev 
* commit '6c0c349f82d0d94eda4b2a6d3b97ec6c24abdccd':
  Make hint text centerred if multiline
 2014-12-09 23:46:38 +00:00
Jorim Jaggi
d711cbc0e7 am 029c90fd: am d1aa0273: am 99117c9b: Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev 
* commit '029c90fdb181e13737b42ae54f099514f1c55b10':
  Reinspect notification for dark mode when updated
 2014-12-09 23:46:34 +00:00
Jorim Jaggi
2f55ea68fa am ef9db949: am fa9f1c5d: am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev 
* commit 'ef9db94914cc2614ec6828719f2bf7a5d4a57f51':
  Update dark mode when notification is updated
 2014-12-09 23:46:29 +00:00
Dan Sandler
5e3c3e77eb am 4ced1d95: am 7971db8c: am c8466327: Squelch chatty log messages. 
* commit '4ced1d959024e2d74f92d9fbdd21b787fd1ba53c':
  Squelch chatty log messages.
 2014-12-09 23:46:24 +00:00
Dan Sandler
030619b96a am c0f60f5e: am 139619b7: am e912c9cc: Repair wifi/cellular kerning. 
* commit 'c0f60f5e55d9d3f3c11c850b7c804f786fa8ae29':
  Repair wifi/cellular kerning.
 2014-12-09 23:46:19 +00:00
Mathieu Chartier
067a513ec8 am f9a1f1bb: am 7a811fc7: (-s ours) am fb5c932d: Merge "Add more -d dalvik details to dumpsys" 
* commit 'f9a1f1bb95b3f79667b4e7fd69eef2773fae892d':
  Add more -d dalvik details to dumpsys
 2014-12-09 23:45:42 +00:00
Dmitriy Ivanov
39191142ce am 5a785719: am 4fed05b4: am f0070999: Merge "Remove unsed check for simulator" 
* commit '5a785719492519afe54eb2dbde3094253826d695':
  Remove unsed check for simulator
 2014-12-09 23:44:57 +00:00
Michael Wright
422db53f8c am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 
* commit 'c6de3212c2dd8638bf3150719ed331673fdcab06':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-09 23:44:00 +00:00
Jeff Sharkey
8650c358fb am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 
* commit '1102e712c11e7679da89a2f66288ca4fad4df85c':
  Throw IOException when missing default ringtone.
 2014-12-09 23:43:53 +00:00
Michael Wright
c6de3212c2 Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 2014-12-09 23:39:50 +00:00
John Reck
3bae94d78e resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp 
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
 2014-12-09 15:38:38 -08:00
Jeff Sharkey
1102e712c1 Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 2014-12-09 23:34:07 +00:00
Joe Fernandez
509815b8a7 am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
automerge: d36d2aa

* commit 'd36d2aad9de1859bbf4ef6c1b429e8ac00ddcb2f':
  :docs studio tips and tricks headings updates
 2014-12-09 23:28:59 +00:00
Jeff Sharkey
87d76f6a3e Throw IOException when missing default ringtone. 
This is caught by Ringtone, and we then fall back to built-in
ringtone, which matches the expected CTS behavior.

Bug: 18610451
Change-Id: I234d17f7cf623b9b0af434e5d367aed28f203b14
 2014-12-09 15:27:25 -08:00
Lajos Molnar
40c38def49 am 77d3489a: am 3547de2f: am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate" 
* commit '77d3489ac7342840b7376c9484e5c9f12c163d3c':
  media: fix isSupportedFormat for integer frame rate
 2014-12-09 23:23:50 +00:00
Lajos Molnar
a4834102a9 am bbd58d88: am f5375fbd: am 38935e6e: Merge "media: allow full range of Vorbis sampling rates" 
* commit 'bbd58d88f0d3ed891dbe15116bfbd1496052b586':
  media: allow full range of Vorbis sampling rates
 2014-12-09 23:23:46 +00:00
Narayan Kamath
b328d72057 am 8ff1a5ee: am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc." 
* commit '8ff1a5ee0df9abba4fc63bcfc93efbda4a176255':
  Fix PhoneStateListener constructor javadoc.
 2014-12-09 23:23:41 +00:00
Sebastien Hertz
dde13b3714 am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 23:23:36 +00:00
Joe Fernandez
d36d2aad9d am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs 
* commit 'a82fc60ce4cc0f7d1167330f4cbb5736551ddd5c':
  :docs studio tips and tricks headings updates
 2014-12-09 23:22:42 +00:00
Mathieu Chartier
5311088a3e am e417db6d: am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit 'e417db6d574e90566e827bb2a1e5efeaa9c6d42e':
  Add more -d dalvik details to dumpsys
 2014-12-09 23:22:38 +00:00
Pavel Zhamaitsiak
22595d9c43 am 963db3fa: am c67da06d: am 0f78ad87: Merge "IMS: start and stop dtmf tones." into lmp-mr1-dev 
* commit '963db3fa697016051a570ccb2d6b566db4f2d594':
  IMS: start and stop dtmf tones.
 2014-12-09 23:22:33 +00:00
Adam Lesinski
74d2947f66 am 55188f59: am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev 
* commit '55188f591844ce34e9c1862f10a85d89fa20cb91':
  AAPT: Dump status of required flag for uses-feature
 2014-12-09 23:22:00 +00:00
Alan Viverette
48614536a7 am 2bbf5575: am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev 
* commit '2bbf5575e71f414d7ad8333d5daeef13ace04cfa':
  Fix auto-advance regression in radial time picker
 2014-12-09 23:21:43 +00:00
Ruben Brunk
28089cc39b Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:20:39 +00:00
Santos Cordon
8c07abe220 am 02775fca: am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service 
* commit '02775fca2b78af8089e9f50575ca639898f4f21c':
  (Telecom-system part 3) Adding Telecom Loader Service
 2014-12-09 23:20:31 +00:00
Jeff Sharkey
dc460d3512 am ea06d6ce: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev 
* commit 'ea06d6ceb70a0a091cae674bb7296bb470f7e594':
  Direct notification of network interface changes.
 2014-12-09 23:20:26 +00:00
Alan Viverette
1a27a0db7c am 08431d05: am c3e16fe3: am 3ba83288: Merge "Add focused & disabled states for spinner assets" into lmp-mr1-dev 
* commit '08431d056990f2dd3bd0d3a0ac8ea9006b423315':
  Add focused & disabled states for spinner assets
 2014-12-09 23:20:21 +00:00