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

167863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
5679d937ff am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit 'ab6515f6214a09e23deee4b432b41d1849ae403f':
  Shadow: Fix the crash in spot shadow
 2014-11-12 23:49:08 +00:00
ztenghui
c3e29108fc am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
* commit 'd46cf7138a955d004911bbd637535390030b328f':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 23:40:21 +00:00
Alan Viverette
84ed482ff9 am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
* commit '1c252a6f8b3dbeb7aa533203731256b3b037d3e2':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:40:10 +00:00
Eric Laurent
33fc23701a am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
* commit 'ac598888e3efbb6fda910ac8bef3bc92811309ba':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:40:05 +00:00
Sandeep Siddhartha
41dc467957 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91 
* commit '5f02d29550588a17add0b83f7e7bfcd324f20778':
  Don't unload the sound model on stopRecognition
 2014-11-12 23:39:50 +00:00
Ruben Brunk
091bf0cc46 am b70dca2d: Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev automerge: 68ced89 
* commit 'b70dca2d21fd73e77329b07175ca3fb25bc02774':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 23:39:27 +00:00
ztenghui
ab6515f621 am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit '4e50ee4f42e4fdf753b9f681a6236f4a46e25bb0':
  Shadow: Fix the crash in spot shadow
 2014-11-12 22:36:04 +00:00
Wale Ogunwale
2a32d9f6d3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev. 
automerge: 89b3ecc

* commit '89b3ecc7b38f9e0601c36176834a66af0f825193':
  Fix build breakage from missing close brace.
 2014-11-12 22:15:08 +00:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
ztenghui
d46cf7138a Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev 
automerge: ffcb5e2

* commit 'ffcb5e210ad82e0f2a33d6644bc6690552a1785f':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 21:22:18 +00:00
Alan Viverette
1c252a6f8b Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev 
automerge: 26478ba

* commit '26478bad42dd3d446131ae65ee0bf6880a950889':
  Fix default attributes in ScaleDrawable
 2014-11-12 21:20:41 +00:00
Eric Laurent
ac598888e3 Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev 
automerge: edd4a22

* commit 'edd4a227e5f49b859f16105a100568fcef4927a3':
  audiosystem JNI: check env pointer before use.
 2014-11-12 21:19:15 +00:00
Sandeep Siddhartha
5f02d29550 Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev 
automerge: 850ec91

* commit '850ec91e88c2b0911f8460f909eabf4078b78582':
  Don't unload the sound model on stopRecognition
 2014-11-12 21:17:53 +00:00
ztenghui
4e50ee4f42 Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 2014-11-12 21:16:31 +00:00
Ruben Brunk
b70dca2d21 Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev 
automerge: 68ced89

* commit '68ced89949fc1cce198f25e09bf9bdb12616a98c':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 21:15:19 +00:00
Dan Albert
5e6cf24213 Merge "Move frameworks/base over to libc++." 2014-11-12 21:11:49 +00:00
ztenghui
3932063bc7 Shadow: Fix the crash in spot shadow 
Fix the crash from searching for closest umbra vertex by initialized the
starting index correctly.

Fix another potential crash related to ray intersection by introducing epsilon.

b/18315089

Change-Id: I9ac9a781a885701a8388714d44f79a1d905e5d33
 2014-11-12 12:58:08 -08:00
ztenghui
ffcb5e210a Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev 2014-11-12 20:47:45 +00:00
Wale Ogunwale
89b3ecc7b3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev. 
Change-Id: I01920b0dc8185d8efb9431bfad911e4733b43e1d
 2014-11-12 12:46:45 -08:00
Alan Viverette
26478bad42 Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev 2014-11-12 20:33:31 +00:00
Eric Laurent
edd4a227e5 Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev 2014-11-12 20:19:52 +00:00
Sandeep Siddhartha
850ec91e88 Merge "Don't unload the sound model on stopRecognition" into lmp-mr1-dev 2014-11-12 20:12:39 +00:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Eric Laurent
449c588710 audiosystem JNI: check env pointer before use. 
Bug: 18332935.
Change-Id: I1ec820f0282833e13444ec05d50da3ce70d19d8d
 2014-11-12 11:07:48 -08:00
Ruben Brunk
68ced89949 Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev 2014-11-12 18:46:47 +00:00
Alan Viverette
f9afb46bf7 Fix default attributes in ScaleDrawable 
Reverts default scales to correct value of -1, uses existing state
values when updating from typed array.

BUG: 18351309
Change-Id: I45d21fe017a7bea10e3cbda50f6db65d053aa2ec
 2014-11-12 10:24:40 -08:00
Wale Ogunwale
2755644d32 Merge "Fix build breakage from missing close brace." into lmp-mr1-dev 2014-11-12 18:22:12 +00:00
Nick Kralevich
56dd295b69 am 6e5b14c4: Merge "Drop unused String." 
* commit '6e5b14c411f7ebdae610c1074e7d4d2d5d2a9550':
  Drop unused String.
 2014-11-12 18:14:23 +00:00
smain@google.com
be0737cdff am e9e96e7f: am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'e9e96e7f0e372459372b31b138124d0760ed2689':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 18:09:54 +00:00
Renato Mangini
d76afdb5e7 am 68fde80a: am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit '68fde80a475cdfe4534378a8fdd97d2ac53c24a6':
  Add "notification" category for samples.
 2014-11-12 18:09:48 +00:00
Nick Kralevich
6e5b14c411 Merge "Drop unused String." 2014-11-12 18:05:16 +00:00
smain@google.com
e9e96e7f0e am 7d0d2f6c: am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit '7d0d2f6c95aa01d6aa43217dec2e183403e7c514':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 18:04:11 +00:00
Renato Mangini
68fde80a47 am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit '2a3ce1853cb5aba8dc1bb9cb9479ec962f8b1e86':
  Add "notification" category for samples.
 2014-11-12 18:04:05 +00:00
Mike Lockwood
ebc3d88380 am 4951482c: Merge "Skip receiver if failed linkToDeath to ILocationListener" 
* commit '4951482c4de1780a9103189aa4eff93b2e91c804':
  Skip receiver if failed linkToDeath to ILocationListener
 2014-11-12 18:00:09 +00:00
Sandeep Siddhartha
45c00b5877 Don't unload the sound model on stopRecognition 
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
 2014-11-12 09:57:27 -08:00
smain@google.com
7d0d2f6c95 am c6bd0155: am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'c6bd0155a76842e39ea0bb75eca33e6e3804437c':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 17:56:26 +00:00
Renato Mangini
2a3ce1853c am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit 'ca011519b61e2ae57dfe760547d7d073f7ec42f3':
  Add "notification" category for samples.
 2014-11-12 17:56:20 +00:00
smain@google.com
c6bd0155a7 am 8d88f19b: am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit '8d88f19bfe8ec0afb27593c0dea9b547d8c80b48':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 17:52:06 +00:00
Renato Mangini
ca011519b6 am a53b8bad: am 4b7b68d8: Add "notification" category for samples. 
* commit 'a53b8badb994c3825140f68eba94888b3274c0b5':
  Add "notification" category for samples.
 2014-11-12 17:52:02 +00:00
Mike Lockwood
4951482c4d Merge "Skip receiver if failed linkToDeath to ILocationListener" 2014-11-12 17:50:20 +00:00
Wale Ogunwale
1dfab89aff Fix build breakage from missing close brace. 
Change-Id: Ib0e58844b8b208d255ff8d9409d0e7c53f27378f
 2014-11-12 09:46:10 -08:00
smain@google.com
8d88f19bfe am f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 
* commit 'f9c4f6b56e1392a411e2996a2bf372873ebf14da':
  fix code type and mention api level 21 exception for bindService()
 2014-11-12 17:44:52 +00:00
Renato Mangini
a53b8badb9 am 4b7b68d8: Add "notification" category for samples. 
* commit '4b7b68d824ee8bf184f6bfb05f75c74c129a9f8e':
  Add "notification" category for samples.
 2014-11-12 17:44:48 +00:00
Andreas Gampe
7be350d2cf am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time" 
* commit 'b93f8d02f886d078b268fe5fd61a95f6911c2644':
  Frameworks/base: Wall Werror in common_time
 2014-11-12 17:42:50 +00:00
smain@google.com
f9c4f6b56e Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs 2014-11-12 17:41:36 +00:00
Alan Viverette
0dea93c0ca am c164b97f: am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 
* commit 'c164b97f465813e8ef7b52378d48b5af80abb4fa':
  Ensure time picker dialog fits on small screens
 2014-11-12 17:40:23 +00:00
smain@google.com
9adc33a658 fix code type and mention api level 21 exception for bindService() 
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
 2014-11-12 09:38:00 -08:00
Alan Viverette
c164b97f46 am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 
* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
  Ensure time picker dialog fits on small screens
 2014-11-12 17:35:58 +00:00
Andreas Gampe
b93f8d02f8 Merge "Frameworks/base: Wall Werror in common_time" 2014-11-12 17:35:15 +00:00
Alan Viverette
4fc2ea8402 Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 2014-11-12 17:32:31 +00:00