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

173498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
a859b50771 am ca922bb4: (-s ours) am d57adbbc: (-s ours) Import translations. DO NOT MERGE 
* commit 'ca922bb455f2351bc3e31bf0b4d8da2c9a58afe6':
  Import translations. DO NOT MERGE
 2015-01-26 14:29:37 +00:00
Geoff Mendal
ca922bb455 am d57adbbc: (-s ours) Import translations. DO NOT MERGE 
* commit 'd57adbbc4f2f8ccd8fc4a4de0508a8243ace3866':
  Import translations. DO NOT MERGE
 2015-01-26 14:23:11 +00:00
Geoff Mendal
d57adbbc4f Import translations. DO NOT MERGE 
Change-Id: If6bad1c33638d232a6f320637ac0e13c8a67adfb
Auto-generated-cl: translation import
 2015-01-26 08:16:38 -06:00
Alexandra Gherghina
2f1964a933 am 1a4802b9: am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev 
* commit '1a4802b9312886c0323958e1c1008de16d5f18c7':
  Update badge assets
 2015-01-26 12:11:09 +00:00
Alexandra Gherghina
1a4802b931 am abaf69dd: Merge "Update badge assets" into lmp-mr1-dev 
* commit 'abaf69dd195aa55c151ab16730e9511539ed46e5':
  Update badge assets
 2015-01-26 12:05:36 +00:00
Alexandra Gherghina
abaf69dd19 Merge "Update badge assets" into lmp-mr1-dev 2015-01-26 11:59:22 +00:00
Benjamin Franz
ad66480838 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
automerge: 2805669

* commit '2805669954b70b918d7b24f6695c4da85d6f88e8':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:59:45 +00:00
Benjamin Franz
2805669954 am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 
* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null
 2015-01-26 10:55:14 +00:00
Zoltan Szatmary-Ban
20bd0c232c am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '059b8ab6a9444b1dbdfcdc1df50485dfac7adafa':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:49:53 +00:00
Benjamin Franz
6d16b8614a Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 2015-01-26 10:49:48 +00:00
Zoltan Szatmary-Ban
059b8ab6a9 am 414ea81e: Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 
* commit '414ea81ea364d7b961cbfb885c30729595e3a7b2':
  Ensure notifications are sent when locking/unlocking location share
 2015-01-26 10:41:00 +00:00
Alexandra Gherghina
b5d34f3b6a Update badge assets 
Bug: 18829152
Change-Id: I26936dc528b8d56e37eb02fa04177ad3f225b007
 2015-01-26 10:40:34 +00:00
Zoltan Szatmary-Ban
414ea81ea3 Merge "Ensure notifications are sent when locking/unlocking location share" into lmp-mr1-dev 2015-01-26 10:36:14 +00:00
Elliott Hughes
f51d65ade0 Merge "Add missing <string.h> includes." automerge: 82a1a2c 
automerge: 86b48b3

* commit '86b48b3f8056a8efa6857d87dd4f30495e8b0464':
  Add missing <string.h> includes.
 2015-01-25 19:27:25 +00:00
Elliott Hughes
86b48b3f80 Merge "Add missing <string.h> includes." 
automerge: 82a1a2c

* commit '82a1a2c63959adc0c7e3208c6ffa6985a346ae57':
  Add missing <string.h> includes.
 2015-01-25 19:21:31 +00:00
Elliott Hughes
82a1a2c639 Merge "Add missing <string.h> includes." 2015-01-25 19:17:42 +00:00
Elliott Hughes
35af2c3534 Add missing <string.h> includes. 
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
 2015-01-25 08:33:36 -08:00
Sanket Padawe
5d4d8d68fc am b0b28059: Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev automerge: c309688 
* commit 'b0b28059b00fa17899e22b0a75310c9348186223':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:06:34 +00:00
Sanket Padawe
b0b28059b0 Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev 
automerge: c309688

* commit 'c309688bfaf204c892635783aad96443a41fdffb':
  Remove entries from config_tether_apndata for some carriers.
 2015-01-24 00:00:58 +00:00
Sanket Padawe
c309688bfa Merge "Remove entries from config_tether_apndata for some carriers." into lmp-mr1-dev 2015-01-23 23:54:47 +00:00
Svetoslav
cd2ed4e64c Accessibility: Sometimes cannot interact with nav bar items. automerge: 10a053e 
automerge: db1983b

* commit 'db1983b3f43e86acbf188961f53af794cce05219':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:31:38 +00:00
Svetoslav
db1983b3f4 Accessibility: Sometimes cannot interact with nav bar items. 
automerge: 10a053e

* commit '10a053e474e2a566b49a1e4c9e2ec4c8cc0013bd':
  Accessibility: Sometimes cannot interact with nav bar items.
 2015-01-23 23:27:34 +00:00
Svetoslav
10a053e474 Accessibility: Sometimes cannot interact with nav bar items. 
If there is a window with the accessibility focus we want to click
on the accessibility focused view in this window. The logic to
compute the bounds of the window was using the wrong window id,
hence getting an incorrect result. As a consequence in some cases
the user could not click on accessiiblity focused controls in the
nav bar.

bug:18889611

Change-Id: I89aee3ae2ffe27fe29819049c287a7155154c65b
 2015-01-23 15:05:20 -08:00
Svetoslav
9027d7355e am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
automerge: 6e9f276

* commit '6e9f276ff1554b59692a1820f60217307460308b':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:30:46 +00:00
Svetoslav
6e9f276ff1 am 42a13865: Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 
* commit '42a13865a4527aaf907a6ced96f726b49b2cbbed':
  Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.
 2015-01-23 22:27:04 +00:00
Svetoslav
42a13865a4 Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev 2015-01-23 22:22:18 +00:00
Jinsuk Kim
f612132003 am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
automerge: ca1384d

* commit 'ca1384dc5abb2d29906310fd577c5ed6fba25f24':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:20:46 +00:00
Jinsuk Kim
ca1384dc5a am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 
* commit '56c119abde951146951e3887796eb64ee05d25d3':
  CEC: Handles initiation of press-and-hold correctly
 2015-01-23 21:16:48 +00:00
Jinsuk Kim
56c119abde Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev 2015-01-23 21:10:38 +00:00
John Reck
1e5dd46133 am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
automerge: bb8d7ff

* commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1':
  Prevent memory corruption from use-after-free
 2015-01-23 20:33:18 +00:00
John Reck
bb8d7ffeae am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 
* commit '94474515e035d726ff24c48233c452ce34ef7c01':
  Prevent memory corruption from use-after-free
 2015-01-23 20:29:10 +00:00
John Reck
94474515e0 Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev 2015-01-23 20:24:57 +00:00
Miao Wang
2fd1a8b6ca am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
automerge: 1446eb8

* commit '1446eb8f6130e4833ca2b74331b867d30445aca3':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:34:48 +00:00
Miao Wang
1446eb8f61 am 2772ee6d: Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 
* commit '2772ee6d8144bde55464592bb74ad35176425ea7':
  [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic
 2015-01-23 19:22:48 +00:00
Miao Wang
2772ee6d81 Merge "[RenderScript] Allow U8_2 & U8_3 input allocation for Histogram Intrinsic" into lmp-mr1-dev 2015-01-23 19:17:13 +00:00
Miao Wang
8a1265384b [RenderScript] Allow U8_2 & U8_3 input allocation for Histogram 
Intrinsic

Bug: 19035242
Bug: 19124958
Change-Id: I9e806d7a0786e728c5f23607dc67ca5d755e12ed
 2015-01-23 19:15:57 +00:00
John Reck
4018eb3763 Prevent memory corruption from use-after-free 
Bug: 19035637

If an app tries to call recycle() on a Bitmap that has
already been finalized it will result in use-after-frees. This is
bad. Avoid this by setting the pointer to 0 and checking for this

Change-Id: I12d73703a0f95b05fe4c2fd8e9c01b6a3f2f023b
 2015-01-23 11:01:05 -08:00
Chet Haase
f647cde899 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
automerge: 458cc6a

* commit '458cc6a51567677e8a4d1012d3ac89ae57c4daf7':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:07:14 +00:00
Chet Haase
458cc6a515 am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 
* commit 'af8c621d2165248cdb60699a6655e56e7dfa2e05':
  Allow infinite-repeat zero-duration animators to continue repeating
 2015-01-23 18:04:03 +00:00
Prerepa Viswanadham
34c32f4034 am 76552bb9: am e77adabe: Don\'t compute flags length for scan response 
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
  Don't compute flags length for scan response
 2015-01-23 18:01:54 +00:00
Chet Haase
af8c621d21 Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev 2015-01-23 17:56:59 +00:00
Prerepa Viswanadham
76552bb963 am e77adabe: Don\'t compute flags length for scan response 
* commit 'e77adabeafa16f9b401a6ad67405205bd96f2219':
  Don't compute flags length for scan response
 2015-01-23 17:56:28 +00:00
Prerepa Viswanadham
e77adabeaf Don't compute flags length for scan response 
Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
 2015-01-23 17:51:43 +00:00
Benjamin Franz
f87b174dac Avoid NullPointerException if createUser returns null 
If createUser returns null, we run into a NullPointerException
in createAndInitializeUser. This can happen when the policy
DISALLOW_ADD_USER is set.

Bug: 19121141
Change-Id: Id4bda832a243fa42c31eb5a176ecaa248aee68f5
 2015-01-23 17:04:16 +00:00
Christoph Studer
b97b519808 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev 
automerge: 9e9885e

* commit '9e9885e1c0b34a6284235e61b023013c1ded6468':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 17:00:00 +00:00
Christoph Studer
9e9885e1c0 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev 
* commit '73500edb42d9270437e41ff2ddaa0cd6eacb422b':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 16:55:31 +00:00
Christoph Studer
73500edb42 Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev 2015-01-23 16:51:46 +00:00
Benjamin Franz
07b87e537d am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit 'bfca5f40eb9e5d888218c615fa744e5d8ea2d207':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:42:38 +00:00
Benjamin Franz
bfca5f40eb am 266303fd: Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 
* commit '266303fdb02ca1cf6df348e1af6830675476fd78':
  Avoid SecurityException when calling getUserData
 2015-01-23 14:37:42 +00:00
Benjamin Franz
266303fdb0 Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-dev 2015-01-23 14:33:06 +00:00