Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
George Mount
a8c1d0232b am bd0d84df: am c18f3cff: am 6140df56: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev 
* commit 'bd0d84df3bbda95affdf4cab0e597cc126919883':
  Fixed OOM due to visibility transitions.
 2014-09-16 21:04:02 +00:00
George Mount
71c0f7330b am 8c08a7e5: am 36f24d34: am f7dfba19: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 
* commit '8c08a7e5bd11715b32645d0ff84626a2d9c3273c':
  Fixed enter/exit transitions working against shared elements.
 2014-09-16 21:03:57 +00:00
Eino-Ville Talvala
8e8318fdca am ee577ba4: am e3ca5a2e: am 949fc209: am ac7be719: Merge "Camera2: Clean up corner case error handling" into lmp-dev 
* commit 'ee577ba4dea973f3e527c264f7c817ff7f69e4bf':
  Camera2: Clean up corner case error handling
 2014-09-16 21:03:52 +00:00
Andres Morales
7e8cc9f6b4 am f2feace6: am 5f3c1be8: am f02fab8c: am 1d436165: Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev 
* commit 'f2feace67ee8f993fe46ef1a742a185fde5c50cc':
  Add hidden API for pausing and resuming NFC polling.
 2014-09-16 21:03:35 +00:00
Craig Mautner
9c26b54d3c Fix various bugs in DatePickerCalendarDelegate 
These bugs were exposed by cts DatePickerTest.

Fixes one item in 17459129.

Change-Id: Ifab52c6e6e760b75633aa4fe8ccf2d724f587e09
 2014-09-16 13:57:59 -07:00
Amit Mahajan
dfbd7494f7 am c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev 
* commit 'c5429d6feab77ad1e426afb5bddc6fcfda06d37e':
  Use Op package name when creating toasts
 2014-09-16 20:57:28 +00:00
Amit Mahajan
915a666c21 Merge "Use Op package name when creating toasts" into lmp-dev 2014-09-16 20:47:24 +00:00
Wink Saville
9bb67459b6 Merge commit 'edd57a98' into fix-conflict 
* commit 'edd57a98':

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ia16537ede73f7b2e2c22ca1ff664a32bd6c272fa
 2014-09-16 13:23:43 -07:00
Alan Viverette
59be81c885 am 66e53f10: am ab9cbf1c: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '66e53f104dd6be534271331eb53eace92f641d73':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:30:37 +00:00
Jorim Jaggi
34ef9ec8d2 am 99e9b12f: am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit '99e9b12fbe444414f7e4fd9a18aa40fee7bf2f1f':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:30:32 +00:00
Martijn Coenen
91c394544c am a90f7071: am 351005d2: am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit 'a90f7071495e67ce270a61ca691b92435134af4e':
  Fix static AID prefix registration.
 2014-09-16 18:30:20 +00:00
Martijn Coenen
43b8ef27b4 am d58331eb: am a31aeb6d: am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'd58331ebf0a637f517780eee36d8c2f4103cbda5':
  AID prefix registration.
 2014-09-16 18:15:43 +00:00
Alan Viverette
dcfe464fbf am ab9cbf1c: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit 'ab9cbf1ca187453910ceca717e54843c7494cb98':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:13:53 +00:00
Jorim Jaggi
0768029b74 am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:13:46 +00:00
Martijn Coenen
7937d50853 am 351005d2: am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '351005d2eb4573de8aeeed79e97f5338e6f5c1f2':
  Fix static AID prefix registration.
 2014-09-16 18:13:36 +00:00
Martijn Coenen
1ab1452a35 am a31aeb6d: am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'a31aeb6da916e1bc22b25d9ec6940b7cde24ec2f':
  AID prefix registration.
 2014-09-16 18:02:43 +00:00
Alan Viverette
e8e61c5438 am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 
* commit '7194361cdaad9150f8440dda99ccdc04556e73e2':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker
 2014-09-16 18:00:39 +00:00
Jorim Jaggi
b6f3e6eb7b am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev 
* commit 'ac9804435867dfaaebe1887d6de30aee7758bb39':
  Use RenderThread for navigation bar ripples
 2014-09-16 18:00:32 +00:00
Alan Viverette
328c630ab6 Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev 2014-09-16 17:55:31 +00:00
Jorim Jaggi
072707dfad Use RenderThread for navigation bar ripples 
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
 2014-09-16 17:51:55 +00:00
Martijn Coenen
c23e98ad24 am 415ef692: Merge "Fix static AID prefix registration." into lmp-dev 
* commit '415ef6926f06ba39bd366bd1d5a6115d0aead640':
  Fix static AID prefix registration.
 2014-09-16 17:49:39 +00:00
Martijn Coenen
9ed2d5f746 Merge "Fix static AID prefix registration." into lmp-dev 2014-09-16 17:40:30 +00:00
Tony Hill
929442d509 Use Op package name when creating toasts 
Some components may be running in processes other than their
base package using android:process directives. The op package
name must therefore be used otherwise the AppOps check will fail
due to a mismatch between the base package name and the UID.

Bug: 17431423
Change-Id: I429aa46066935b964151a2ec0854f0e14c117c4e
 2014-09-16 10:16:43 -07:00
Martijn Coenen
0985fb6c42 Fix static AID prefix registration. 
Bug: 16517161
Change-Id: Ibaddf8720907f1d28d44231d927f538628bbf9d0
 2014-09-16 10:09:12 -07:00
Martijn Coenen
92dafc67db am cd108cbe: Merge "AID prefix registration." into lmp-dev 
* commit 'cd108cbe643d824437e8a629aa258a62ad237b39':
  AID prefix registration.
 2014-09-16 15:04:53 +00:00
Martijn Coenen
7e25a504d4 Merge "AID prefix registration." into lmp-dev 2014-09-16 14:55:04 +00:00
Edward Jee
f067f8fb16 am 84d05ed5: am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '84d05ed5a229186c7859013327887f6af7ef4a29':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 09:12:33 +00:00
Igor Murashkin
86c2964cb9 am a9da866c: am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit 'a9da866c38b54d5c63fff0f3daec2f1fe42ec9dd':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 09:12:28 +00:00
Adam Lesinski
6f1b1a410e am e6eafce4: am 3b36b8c7: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit 'e6eafce4dcbb658f7e139b1430bd00b9258fb5d5':
  Show the lockscreen when more than 1 user is present
 2014-09-16 09:12:23 +00:00
Eino-Ville Talvala
39dca501a4 am 03597aea: am c142ac27: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit '03597aeab4a8c79d96fdf3c487c73e9034d3ee55':
  Camera2: Check for sequence complete sooner.
 2014-09-16 09:12:18 +00:00
Alan Viverette
def05dd180 am 408c61a1: am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '408c61a12efae5c69c27fae058b0fbe83bfebc37':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 09:12:13 +00:00
Yohei Yukawa
bb5118edbf am 382b6e5e: am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit '382b6e5e87a537bf35ae4b7a36ef3e3e92f7300b':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 09:12:03 +00:00
Ang Li
4797fb0b39 am b2dc8ba3: am 94325a15: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit 'b2dc8ba327a582799c803934c965ea7f903c4e8e':
  Fix a typo in comment.
 2014-09-16 09:11:58 +00:00
Adam Powell
938c00bfed am 55c08aa6: am 9965e970: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit '55c08aa6db4cf73b2bdeef59d008cc026a737a16':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 09:11:53 +00:00
Adam Powell
8a0be0e3b0 am 751fb558: am acec24c1: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit '751fb558fd0e81a7c4f41b55973900183160c372':
  Finish materializing dialogs
 2014-09-16 09:11:42 +00:00
Chet Haase
3ec7a4c8a6 am bb8d6776: am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit 'bb8d67768806662f59bb14b918134c547434ac86':
  Avoid invalidating view during some outline invalidations
 2014-09-16 09:11:22 +00:00
Edward Jee
cbf76135e0 am 8a20c56f: am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit '8a20c56fe0011b8a5ba11e39e734679f89be3f3d':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 08:59:40 +00:00
Igor Murashkin
4280c893bf am da839237: am 6d2cca33: Merge "camera2-legacy: Fix jpeg thumbnail quality not being set" into lmp-dev 
* commit 'da839237d71b97dcd789e54031497da39361698a':
  camera2-legacy: Fix jpeg thumbnail quality not being set
 2014-09-16 08:59:34 +00:00
Adam Lesinski
2958c016a1 am 3b36b8c7: am 1416621b: Merge "Show the lockscreen when more than 1 user is present" into lmp-dev 
* commit '3b36b8c7d91dc8793429491617c645c1aafc4d49':
  Show the lockscreen when more than 1 user is present
 2014-09-16 08:59:29 +00:00
Eino-Ville Talvala
810d34a4a1 am c142ac27: am 3703cae1: Merge "Camera2: Check for sequence complete sooner." into lmp-dev 
* commit 'c142ac272ab02d85edf07ad7da79006c33c3b613':
  Camera2: Check for sequence complete sooner.
 2014-09-16 08:59:24 +00:00
Alan Viverette
1454fe9553 am 56fbc575: am 1375db70: Merge "Always apply ImageView\'s tint attribute using SRC_ATOP by default" into lmp-dev 
* commit '56fbc5751bd2da6227c03372f3d90ab4c7333f22':
  Always apply ImageView's tint attribute using SRC_ATOP by default
 2014-09-16 08:59:18 +00:00
Yohei Yukawa
abe0c395f9 am 5a2efd42: am 8219934a: Merge "Minimize the number of default enabled IMEs part 3" into lmp-dev 
* commit '5a2efd42d8d0b1c52f628b8e727d3c99b068ae96':
  Minimize the number of default enabled IMEs part 3
 2014-09-16 08:59:08 +00:00
Ang Li
e2291d9763 am 94325a15: am 36fdf64f: Merge "Fix a typo in comment." into lmp-dev 
* commit '94325a15c53e252b10c75e4c197858d028f4a37b':
  Fix a typo in comment.
 2014-09-16 08:59:03 +00:00
Adam Powell
7276265f31 am 9965e970: am 3b2dfa7a: Merge "Treat empty string as title-set in ToolbarWidgetWrapper" into lmp-dev 
* commit '9965e9708b5dc64bc9e591f72ff6eaf6c3968d0f':
  Treat empty string as title-set in ToolbarWidgetWrapper
 2014-09-16 08:58:58 +00:00
Adam Powell
5ba05c4fb5 am acec24c1: am 17ec7920: Merge "Finish materializing dialogs" into lmp-dev 
* commit 'acec24c1487e32264ee395121db2e607259dd7ca':
  Finish materializing dialogs
 2014-09-16 08:58:48 +00:00
Chet Haase
ab387230be am bae5621a: am 4b20b031: Merge "Avoid invalidating view during some outline invalidations" into lmp-dev 
* commit 'bae5621a7d9a60e16ff1ac7b3a5c4be06dec2305':
  Avoid invalidating view during some outline invalidations
 2014-09-16 08:58:30 +00:00
Jeff Sharkey
691ac9e7d0 am a6a5bea4: am 07b76d6f: am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit 'a6a5bea41779c3f0764a2c0f18f1251649ddd1ee':
  Update API naming to follow style guide.
 2014-09-16 08:57:52 +00:00
Chris Craik
9ec684467a am d0ca31dc: am 103a3379: am 447f8cd8: Merge "Enable shadow for GhostView" into lmp-dev 
* commit 'd0ca31dc14351662eaf4106b9bbec9a4bf75fafa':
  Enable shadow for GhostView
 2014-09-16 08:57:37 +00:00
Ihab Awad
02e2375c44 am 64741972: am fd9884ad: am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '647419725bdddb764bfc6ae638ac0288bc8591e5':
  Add system feature for ConnectionService API support (1/3)
 2014-09-16 08:57:27 +00:00
Edward Jee
d796159bbb am c172b209: Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev 
* commit 'c172b2090317b158974bc73d8baa141449a1d784':
  Adds APIs for Bluetooth PBAP and MAP access permission.
 2014-09-16 08:44:13 +00:00