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

202324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
94d9f3c788 Import translations. DO NOT MERGE 
am: 73ecaf0881  -s ours

* commit '73ecaf0881121522831c33563c5dcdcfda11f895':
  Import translations. DO NOT MERGE
 2016-02-01 23:21:45 +00:00
Geoff Mendal
73ecaf0881 Import translations. DO NOT MERGE 
Change-Id: I25920d1a09b527c9e2868537f68d994a40a85e6a
Auto-generated-cl: translation import
 2016-02-01 13:24:23 -08:00
Geoff Mendal
f544fc21d0 Import translations. DO NOT MERGE 
Change-Id: Ic5942cf8f289103e9a78b93e69211bf17a47b344
Auto-generated-cl: translation import
 2016-02-01 12:37:44 -08:00
Joe LaPenna
7528f57c4d [DO NOT MERGE ANYWHERE]: Allow button events in ambient. 
See thread: "key presses & Ambient"

BUG: 25964771
BUG: 26524301

Change-Id: I914edd447c38678a06d27677be4597c0ee384635
 2016-01-27 14:19:44 -08:00
Nick Vaccaro
907108ca0f Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev 2016-01-26 20:13:26 +00:00
Peng Xu
79c004b2c1 [DO NOT MERGE ANYWHERE] Fix bodysensor permission 
Bug: 26481493
Bug: 26447970
Change-Id: Ibeaf5a5e39f0dc552cf115d2834a1ec28ecef5ab
 2016-01-26 20:10:27 +00:00
Wei Liu
b8eaf45e1d Add a null check before reference networkInfo. 
b/26758858

Change-Id: If335ece223114dbfb6b08391f18a09467f377cf1
 2016-01-25 10:34:27 -08:00
Bryce Lee
2e7ecddd5b Merge "DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall." into cw-e-dev 2016-01-21 23:01:06 +00:00
Bryce Lee
fe985fa7f0 DO NOT MERGE ANYWHERE Improve logging in BluetoothHeadsetClientCall. 
Change-Id: I3b1b3946ca21c0bbc902a2c521938239a486d98a
 2016-01-21 22:54:56 +00:00
Matthew Williams
c151cec56e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours am: 5cb2597a9d 
am: 08d7e9608e

* commit '08d7e9608ea822815b15be15a66f26be664ce541':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:08:07 +00:00
Matthew Williams
08d7e9608e DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 am: 1f6dbd910b -s ours 
am: 5cb2597a9d

* commit '5cb2597a9da3202229fdbc91c12b8e172b2b5667':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 19:01:02 +00:00
Matthew Williams
5cb2597a9d DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 am: 9e52b29fe2 
am: 1f6dbd910b  -s ours

* commit '1f6dbd910bf9bf93df8a708209e92add61fbff44':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:54:44 +00:00
Matthew Williams
1f6dbd910b DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 
am: 9e52b29fe2

* commit '9e52b29fe27035df4720db582637157ce9ce268d':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:48:55 +00:00
Matthew Williams
9e52b29fe2 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours 
am: a76208d4e4

* commit 'a76208d4e4f7f690f5fde4210a00a5c3022721bd':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:41:55 +00:00
Matthew Williams
a76208d4e4 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a 
am: 9c841923df  -s ours

* commit '9c841923dfc36db046909e388b8a2fda3b694be1':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:37:01 +00:00
Matthew Williams
9c841923df DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours 
am: 0d3e46391a

* commit '0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:29:33 +00:00
Matthew Williams
0d3e46391a DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 
am: 5fc753acaf  -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:19:53 +00:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs 
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-21 14:15:11 +00:00
Chenjie Luo
b2b2fb0182 Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev 2016-01-20 23:38:46 +00:00
Chenjie Luo
e66554d4be Fix bug in AssetAtlas packing loop 
There is a bug in AssetAtlasService that it always choose the
MAX_SIZE as height. The for loop of height calculation starts
from MAX_SIZE and breaks when it finds a working texture. This
means the height loop will always break for the initial value.
Reording the loop optimize the algorithm to find a smaller
atlas texture. The MIN_SIZE is also changed to 512 for fewer
assets case.

Bug: 26429912
Change-Id: Ic0b2396e9697c417a24f81ec792f8a8af53915ad
 2016-01-20 14:35:29 -08:00
Matthew Williams
85f169d19f Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3 
am: ce3842eb1a

* commit 'ce3842eb1a5184331ee4aad3e36d5f11f999cf2e':
  Redact Account info from getCurrentSyncs
 2016-01-20 18:08:33 +00:00
Matthew Williams
ce3842eb1a Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c 
am: 0f292147f3

* commit '0f292147f3ac803a8701afd7362ad3e0487fd496':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:55:52 +00:00
Matthew Williams
0f292147f3 Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e 
am: a947baa87c

* commit 'a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:51:42 +00:00
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb 
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:46:39 +00:00
Matthew Williams
be136b7a3e Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:41:23 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389 
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs 
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-20 00:02:58 +00:00
Chenjie Luo
4a577bff96 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev 2016-01-14 02:22:15 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys 
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
 2016-01-14 01:26:05 +00:00
Nancy Zheng
74dfcf90f1 Pulling in https://android-review.googlesource.com/#/c/186482/1 
Fix memory leak in HWUI

std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.

Bug: 26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
 2016-01-13 15:23:56 -08:00
Matthew Bouyack
eebf168e43 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev 2016-01-12 22:28:21 +00:00
Matthew Bouyack
7f667e7a08 In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos 
and save the result. Then pass that value to
UiFrameInfoBuilder::setVsync as both arguments.

The order of function argument evaluation is undefined in C++. Because
the value returned from TimeLord::latestVsync may be changed by
the preceding call to TimeLord::computeFrameTimeNanos the values of the
arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This
change removes any ambiguity.

Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc
 2016-01-12 12:01:48 -08:00
Hall Liu
468bb1a56c Initialize MD5 in logging in background 
Use a background task to call MessageDigest.getInstance in order to
avoid a possible disk read on initialization.

Bug: 26069217
Change-Id: I0091ce012bcd811dfca0e85c21a12c54913ed919
 2016-01-11 17:28:08 -08:00
Geoff Mendal
8635657b17 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours 
am: 0663959eb7  -s ours

* commit '0663959eb73127a49d0a72a70000f3b092adc3e6':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:46:49 +00:00
Geoff Mendal
0663959eb7 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours 
am: 73992aee94  -s ours

* commit '73992aee94ce78b8827fe05bb5537068a96c835d':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:42:10 +00:00
Geoff Mendal
73992aee94 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev 
am: 66841a62f1  -s ours

* commit '66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 15:37:27 +00:00
Geoff Mendal
66841a62f1 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev 2016-01-11 15:33:48 +00:00
Geoff Mendal
376082a67f Revert "Import translations. DO NOT MERGE" 
This reverts commit a4505e926410cbf20dcd301f35f3496628cad9de.

Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
 2016-01-11 15:33:28 +00:00
Geoff Mendal
9f094ac04d Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours 
am: 0b8de39728  -s ours

* commit '0b8de39728014ad51ff6784a3850a3d752f715e3':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:52:22 +00:00
Geoff Mendal
23c92d99cf Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours 
am: 4ae777097e  -s ours

* commit '4ae777097e4242e546c0b7e477cbd0829689dff5':
  Import translations. DO NOT MERGE
 2016-01-11 14:50:39 +00:00
Geoff Mendal
0b8de39728 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours 
am: 14c37a57ea  -s ours

* commit '14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:45:46 +00:00
Geoff Mendal
14c37a57ea Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours 
am: b409a99ccc  -s ours

* commit 'b409a99ccc0a42814f3918c689d06526c09f726b':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:41:17 +00:00
Geoff Mendal
b409a99ccc Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours 
am: 009fb756ec  -s ours

* commit '009fb756ecabd78e5300c619c267f2e55cfd0922':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:36:52 +00:00
Geoff Mendal
009fb756ec Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours 
am: 4df8f4abe0  -s ours

* commit '4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:32:35 +00:00
Geoff Mendal
4df8f4abe0 Revert "Import translations. DO NOT MERGE" 
am: 8874f9754f  -s ours

* commit '8874f9754f909dafcc2c5c23109e35297263f469':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:28:57 +00:00
Geoff Mendal
8874f9754f Revert "Import translations. DO NOT MERGE" 
This reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.

Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
 2016-01-11 14:24:19 +00:00
Geoff Mendal
2ed7b6d82a Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours 
am: eab7785333  -s ours

* commit 'eab778533331bc25b3b201ebb9519a016a451ae4':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:22:02 +00:00