Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,783 Commits 3 Branches 0 Tags
4ff668d47ab9f49ec81606aec6d469ecd6ca37fa
Commit Graph

163783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
9c5b7cb048 Notify the system of all remote volume changes 
If a volume change occurred because it was sent through the MediaController directly
it wasn't showing the system's volume UI. This fixes things so the volume slider gets
shown for all volume requests with the SHOW_UI flag set.

bug:19036130
Change-Id: I1f7cb2e03386e2f3f7bc448cb4c38a71573775ff
 2015-01-16 17:57:33 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
97c4ba9862 docs: Added info on noHistory and onActivityResult(). 
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
 2015-01-16 09:24:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Kenny Guy
10dd6eeff8 am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit 'fd846dfbf1d1e51f8366a473d3b6f5722c06d77c':
  Sync file before using JournaledFile commit.
 2015-01-16 11:24:56 +00:00
Kenny Guy
fd846dfbf1 Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 2015-01-16 11:21:19 +00:00
Jinsuk Kim
6821efc66f am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '2ab6d9fff36836c71bc0ee4afa25c11b48a9bd99':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:23:05 +00:00
Jinsuk Kim
2ab6d9fff3 CEC: Do not send <Active Source> when TV wakes up by one touch play 
TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e
 2015-01-16 17:18:36 +09:00
Jinsuk Kim
2bf3b2c49c am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '964c00dd7b270dcf80aea3450bbfc23502965cce':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:17:07 +00:00
Jinsuk Kim
964c00dd7b CEC: Buffer Cec messages while allocating logical address 
CEC messages arriving before logical address allocation was being
discarded. Handles them by introducing a message buffer class
to keep them till the address allocation is finished.

Also updated per-device message buffer to use copied version of
messages list for iterating to avoid the possible concurrent
modification exception.

Bug: 18896770
Change-Id: Ifb74fd265510de6dde322e0b3bc5b504fecb4daa
 2015-01-16 16:18:32 +09:00
Christopher Tate
cf96260118 Don't write widget metadata to backup unless it's new/changed 
Redundant backup traffic is bad.  Don't commit the widget metadata payload
(or the deletion operation for it) unless the widget state of the app has
actually changed since the last backup.

Bug 19003911

Change-Id: I93819173c0e2357b030d9e2b3d2ee57f2410bb57
 2015-01-15 17:37:06 -08:00
Rich Slogar
b43a7eefb7 am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit '3212c3aa226f8cc7cf54e72772a001906fd4d7c3':
  docs: studio support library revisions update
 2015-01-16 00:58:57 +00:00
Dirk Dougherty
7b7f074f28 am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit 'd1ff86058a06874d6d607dea951b34370e053654':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 00:58:53 +00:00
Rich Slogar
3505303a3a am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit '3b7dbd66d8d8df89bb4700bfdfaf86f264ff7ea4':
  docs: build link update
 2015-01-16 00:50:15 +00:00
Rich Slogar
f1feda36fb am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit '485b9566a9fc98be8b4dee40ddca43690de1a465':
  docs: Plugin reference update
 2015-01-16 00:50:12 +00:00
Rich Slogar
f38122dae0 am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit '48fc1d7ba7e3e2c0efd71b3b7ed29997d3454857':
  docs: studio sample procedure update
 2015-01-16 00:50:08 +00:00
Rich Slogar
3212c3aa22 Merge "docs: studio support library revisions update" into lmp-docs 2015-01-16 00:43:57 +00:00
Dirk Dougherty
d1ff86058a Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 2015-01-16 00:41:56 +00:00
Dirk Dougherty
27ab5a079b Doc change: Add new analytics information to Distribute. 
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
 2015-01-15 16:28:13 -08:00
Rich Slogar
3b7dbd66d8 Merge "docs: build link update" into lmp-docs 2015-01-16 00:27:50 +00:00
Rich Slogar
485b9566a9 Merge "docs: Plugin reference update" into lmp-docs 2015-01-16 00:27:05 +00:00
Rich Slogar
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Rich Slogar
d7beb6d3eb docs: studio support library revisions update 
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
 2015-01-15 16:20:44 -08:00
Geoff Mendal
d3403e45d6 am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a':
  Import translations. DO NOT MERGE
 2015-01-15 23:45:54 +00:00
Geoff Mendal
faf92d7256 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-15 23:39:49 +00:00
Deepanshu Gupta
b6864ac6cd Resource resolution fixes. 
1. Some dynamic ids weren't created and resulted in ResourceNotFound
exceptions.
2. Prevent NPE if a style attribute (eg. style="?attr/foo"), which
cannot be resolved, is resolved. This effectively, also results in
making it harder to catch misconfigured themes. However, support
library does it, and we don't want to throw errors when the library is
working as intended.

Change-Id: I731d8fb9209eb72b464d235d1072d416e132970b
 2015-01-15 15:25:49 -08:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Geoff Mendal
116f90c895 Import translations. DO NOT MERGE 
Change-Id: I4580b358133cd261985459a26a1c4bc36a14d630
Auto-generated-cl: translation import
 2015-01-15 15:14:15 -08:00
Chris Craik
0de2eca5fc am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '112e35b4641a1a8cad3616c8209ab47f03f9ab67':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:08:11 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00
Eric Laurent
4772f8b841 am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '16cfa8ddfd6c18577f5d38e545597a63889d9779':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:16:28 +00:00
Eric Laurent
16cfa8ddfd Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 2015-01-15 22:10:53 +00:00
Alan Viverette
03748a5707 Ensure scroll assets are drawn with correct opacity 
Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
 2015-01-15 13:00:21 -08:00
Eino-Ville Talvala
1334a6f342 am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '8d47bc97e642cd0d0caf31d09efe05d8dc233f27':
  Camera: Clarify JNI exception message
 2015-01-15 20:06:34 +00:00
Eino-Ville Talvala
8d47bc97e6 Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 2015-01-15 20:00:02 +00:00
Luan Nguyen
b47cf562bb am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'e184b2f2355e572fa67e748e625e4eea0ac29201':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:42:21 +00:00
Luan Nguyen
e184b2f235 am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:36:35 +00:00
Luan Nguyen
d5a114cd0e am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:30:08 +00:00
Winson Chung
5675f01868 DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531) 
We can use our normal visibility check to dismiss Recents when the screen is off,
since the system broadcast can occur after the activity is stopped.  We should use
the same mechanism we use to test visibility when launching Recents and just see
if it is the top most activity.

Change-Id: Ib9c01e78fd9221c4fb0ffcc80a01a0c58fb96836
 2015-01-15 11:27:43 -08:00
Roozbeh Pournader
a4d1e25000 am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit '9787039d91ad23805a1e73e1cd973b85295b85c2':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:10:33 +00:00
Roozbeh Pournader
9787039d91 Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 2015-01-15 18:56:08 +00:00
Kenny Guy
212037f7cd Sync file before using JournaledFile commit. 
Ext4 doesn't guarantee that write file.new / close file.new
rename file.new to file will mean data in file.new makes it
to file atomically. The rename may happen with previous contents
of file.new and then later update to new contents
See docs for noauto_da_alloc
So rebooting the device during JournaledFile.commit may
mean we are left with an empty file.

Bug: 18590558
Change-Id: I35322c82871bed30c2c6ebbd1388338f0471f3ba
 2015-01-15 18:48:01 +00:00
Eric Laurent
f076db4070 AudioManager: make AudioPortEventHandler static 
Make AudioPortEventHandler and audio port and patch caches
static members of AudioManager. There is only one callback
per process in AudioSystem for audio port updates
and having those non static would not work when more than
one AudioManager instance exists in one app.

Bug: 18727023.
Change-Id: I4c1041dc6441d168be4efa066e14289cc5f41872
 2015-01-15 10:13:52 -08:00
Luan Nguyen
d3cc11a164 docs: Remove reference to handheld app for bitmap resource locations. 
bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
 2015-01-15 09:24:09 -08:00
Nicolas Prevot
97f1ac016b am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:35:05 +00:00