Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,824 Commits 3 Branches 0 Tags
1c51eb41ee57bb2aeff62dd23576c6565a86de17
Commit Graph

164824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
1c51eb41ee Revert "Import translations. DO NOT MERGE" 
am: 9e5fe1a7da  -s ours

* commit '9e5fe1a7da02055c03b434db04f0927ba174f3f9':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:11:44 +00:00
Geoff Mendal
9e5fe1a7da Revert "Import translations. DO NOT MERGE" 
This reverts commit f7e5202668.

Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672
 2016-01-11 14:04:51 +00:00
Geoff Mendal
0b1a880876 Import translations. DO NOT MERGE 
am: f7e5202668  -s ours

* commit 'f7e5202668cd2b0dc26a65e46b68a4267567bce0':
  Import translations. DO NOT MERGE
 2016-01-11 13:40:07 +00:00
Geoff Mendal
f7e5202668 Import translations. DO NOT MERGE 
Change-Id: I2591758894a20c8459e7161ab6d97ac3a9a32654
Auto-generated-cl: translation import
 2016-01-11 08:22:53 -05:00
Baligh Uddin
6980f76931 Fix plurals variable to unblock Translations Pipeline. 
am: 71921cb23c

* commit '71921cb23c7493ae6c7186d5554233540c9bcc9c':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:18:10 +00:00
Baligh Uddin
71921cb23c Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
(cherry picked from commit 50d23adfe2)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
 2016-01-06 18:55:26 +00:00
Sebastien Hertz
f915991842 Allow debugging only for apps forked from zygote 
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322c)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
(cherry picked from commit ff8dc21278)
 2015-11-10 23:20:53 +00:00
Chris Elliott
d9a2be8d3d DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE 
This reverts commit 7e19e286cc.

Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
 2015-11-06 17:41:17 +00:00
Daniel Koulomzin
7e19e286cc ActivityView gets its own thread pool. DO NOT MERGE 
Bug: 24316798

Change-Id: I4278fa792cec8d2710f2f41eed02ba4a14af7052
 2015-11-03 17:53:45 -05:00
Ned Burns
f4e1d10cd3 Kill ActivityView's background thread when it's destroyed 
We were leaking background threads for every new ActivityView.

Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38
 2015-09-23 20:19:16 -04:00
Yuchao Zhou
c38ffecc34 Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev 2015-09-16 22:42:34 +00:00
Yuchao Zhou
2de4b74d80 Moving BTtraffic from experiment location to here 
Change-Id: I1b0ec7fba87a098aa6509bd9be3f0e0ff624bf6e
 2015-09-16 15:37:40 -07:00
Sridhar Vashist
efc0335586 DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. 
Ignore setWakeMode based on system property.
Wakelocks essential for playback will be held by audioflinger.

Change-Id: I413cd873bf21e1e999dbf89a27802fbe1b6022c7
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
 2015-09-08 16:33:05 -07:00
Filip Gruszczynski
0b388d4a36 Don't animate burn-in return when it wasn't applied. 
The burn-in protection return animation is performed based on the last
offset that was used, but it doesn't mean that such offset is currently
applied. Right after entering ambient mode no offset is applied, so if
we start a return animation using the last applied offset, it will cause
a shake. The animation will first shift from 0, 0 offset to the last
offset and then return again to 0, 0. This CL makes it not apply the
animation in that case.

Bug: 22519478
Change-Id: I5cb750b56e9715c6d9389136071a5e0fbafb047b
 2015-07-27 15:32:21 -07:00
Filip Gruszczynski
550f1d4eb3 Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev 2015-07-16 21:47:29 +00:00
Zach Johnson
7bcb9597c8 Fix BluetoothSocket file descriptor leak 
Sockets accepted on a server socket didn't populate
the mPfd field, which is used to close out the java
end of the native-and-java communication socket when
the overall rfcomm socket is closed. #badnewsbears

b/21398841

Change-Id: I3adb0a9965f83d0f3006fa4f79ea4abeab5c9a17
 2015-07-13 22:50:13 -07:00
Filip Gruszczynski
0a012ba55d Delete overscan setting by both unique id and name. 
When overscan with only zeros is set, it removes an entry by display's
unique identifier. It turns out in the past the readable name must have
been used in the past and there is a lingering value in the xml file.
This CL purges also the display name entry.

Bug: 22357152
Change-Id: Ie2daf76677eb96df474acb546491194d0aaf8bc0
 2015-07-13 15:00:11 -07:00
Filip Gruszczynski
c3d69a798e DO NOT MERGE - Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.


Bug: 21602590
Change-Id: I5860d5e7c20131e2650bdb8635e9659e76205fa1
(cherry picked from commit e660d4e96a)
 2015-07-09 17:47:54 +00:00
Filip Gruszczynski
45eb3ea667 Revert "Fix NPE when requesting outsets for detached view." 
This reverts commit b010291ace.

Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
 2015-07-09 01:06:40 +00:00
Filip Gruszczynski
b010291ace Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit e660d4e96a)
 2015-07-08 23:22:36 +00:00
Wale Ogunwale
e155eef488 am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '2735ac71e6d8d1c00b95104057ac9365abb485d9':
  Prevent system uid component from running in an app process
 2015-07-02 01:22:06 +00:00
Wale Ogunwale
2735ac71e6 am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '22cd16a01f55149507c1d5d71c408987a71737fc':
  Prevent system uid component from running in an app process
 2015-07-02 01:07:44 +00:00
Wale Ogunwale
22cd16a01f am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'bc4743ebe845958fab8bbb0d0a425d55ece3d205':
  Prevent system uid component from running in an app process
 2015-07-02 00:50:52 +00:00
Wale Ogunwale
bc4743ebe8 am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '7ab264abc214b7e1b7fff9934814020cea5f18fa':
  Prevent system uid component from running in an app process
 2015-07-02 00:37:02 +00:00
Wale Ogunwale
657d20ee57 am 44000724: am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit '44000724ef630182579004939d0c064664d9d3f2':
  Prevent system uid component from running in an app process
 2015-07-02 00:35:51 +00:00
Wale Ogunwale
b6f87997cb am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit 'f54d17224bada1d852ba7c9d4bb9e2a792c0093b':
  Prevent system uid component from running in an app process
 2015-07-02 00:35:47 +00:00
Filip Gruszczynski
0385059195 Handle outsets when resized is called due to rotation. 
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.

Bug: 22209764

Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
 2015-07-01 10:23:47 -07:00
Wale Ogunwale
44000724ef am 5278cea1: am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit '5278cea1f35b2b54606cc1bb78195bd2f84953da':
  Prevent system uid component from running in an app process
 2015-07-01 17:19:26 +00:00
Wale Ogunwale
f54d17224b am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '52034328081e8c3420f9228192343835465afa13':
  Prevent system uid component from running in an app process
 2015-07-01 17:19:20 +00:00
Wale Ogunwale
7ab264abc2 am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '742bfa809cf2c022d690f84b4213e908ee66e8aa':
  Prevent system uid component from running in an app process
 2015-07-01 17:17:23 +00:00
Wale Ogunwale
5278cea1f3 am d72dc762: am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'd72dc76275d7d0cc9559e0e5439bcc3ccbda81a2':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:58 +00:00
Wale Ogunwale
5203432808 am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '131e6b24d88c4704687f41e9a016ab1919c53fa4':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:54 +00:00
Wale Ogunwale
742bfa809c am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:02 +00:00
Wale Ogunwale
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
 2015-07-01 16:39:11 +00:00
Wale Ogunwale
d72dc76275 am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'ec425a19f973e2511485b61424dffb9f3cafb542':
  Prevent system uid component from running in an app process
 2015-07-01 16:35:21 +00:00
Wale Ogunwale
131e6b24d8 Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 2015-07-01 16:30:43 +00:00
Wale Ogunwale
ec425a19f9 am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:42 +00:00
Wale Ogunwale
c215b2b245 am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'dc9cfca80139714ca37122148d041beedbf0ceb2':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:17 +00:00
Wale Ogunwale
df9948d812 Merge "Prevent system uid component from running in an app process" into lmp-dev 2015-07-01 16:06:48 +00:00
Wale Ogunwale
dc9cfca801 Merge "Prevent system uid component from running in an app process" into klp-dev 2015-07-01 16:06:34 +00:00
Filip Gruszczynski
96496e2d17 Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev 2015-06-30 22:02:34 +00:00
Filip Gruszczynski
7e3b61e73d Build fix after changing IWindowSession. 
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
 2015-06-30 14:42:21 -07:00
Amit Mahajan
71699d760e am 95c47354: am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '95c47354a6841d7ae3a81fcacea5acdd25dc42c6':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 21:40:32 +00:00
Joe Fernandez
cbbbabaa4a am 4c8ecd9a: am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '4c8ecd9a70b3ba1bbf0b546c6189a892e63a6f18':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 21:40:27 +00:00
Amit Mahajan
95c47354a6 am 43d3bd02: am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '43d3bd027604f400caf49826e5b4705784937b35':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 21:23:41 +00:00
Joe Fernandez
4c8ecd9a70 am 72356f0b: am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '72356f0b20d4e6d84430629c2bb7d8baac55002d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 21:23:34 +00:00
Amit Mahajan
43d3bd0276 am 83631047: am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '8363104782302c08f2f03d4e1e345edb7f20876c':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 20:11:48 +00:00
Joe Fernandez
72356f0b20 am f1686ac2: am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit 'f1686ac225c75991d931348818065f9e99cf0b73':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 20:11:40 +00:00
Amit Mahajan
8363104782 am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-30 20:00:00 +00:00
Joe Fernandez
f1686ac225 am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-30 19:59:53 +00:00