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

183832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
f834c282aa Merge "Fix a regression in UsbDebuggingManager" 2015-03-04 18:04:02 +00:00
Amith Yamasani
f4a8df4c7e Fix a regression in UsbDebuggingManager 
Catch NPE as well if socket object is null.

Bug: 19602060
Change-Id: I7cf9cb16abc3fde626170c1aefeba5fc91c5734f
 2015-03-04 10:00:11 -08:00
Eric Gilmore
62777b189d am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
  Fixing broken link per b/19503824.
 2015-03-04 17:53:31 +00:00
Eric Gilmore
5c30adfdb6 am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs 
* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
  Fixing broken link per b/19503824.
 2015-03-04 17:47:01 +00:00
Andrew Shulaev
2de257f083 Merge "Revert "Added function to render a drawable in all available states"" 2015-03-04 17:44:12 +00:00
Evan Charlton
a71a79dea3 Merge "Fix some javadocs typos" 2015-03-04 17:43:39 +00:00
Andrew Shulaev
01cdf8b135 Revert "Added function to render a drawable in all available states" 
This reverts commit 63483e17de4d2441acaabcee4185b0bb25e1d94c.

Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18
 2015-03-04 17:43:19 +00:00
Eric Gilmore
22d1c1ce1d Merge "Fixing broken link per b/19503824." into lmp-docs 2015-03-04 17:40:16 +00:00
Dhananjay Kumar
a7d57a6f00 soundpool: update sample rate when reusing audiotrack 
User might update playback rate while calling Play on a sample.
Update sample rate if reusing existing audio track.

Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0
Signed-off-by: Glenn Kasten <gkasten@google.com>
 2015-03-04 09:22:18 -08:00
Haynes Mathew George
570576b51b soundpool: reuse channel for same sample if available 
Reuse channel for same sample if the channel completed
current playback and is not reallocated to another sample,
i.e. not stolen by other sample.

authored-by: Ashish Jain <ashishj@codeaurora.org>

Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b
Signed-off-by: Glenn Kasten <gkasten@google.com>
 2015-03-04 09:16:28 -08:00
Andrew Shulaev
14ef3ae59e Merge "Added function to render a drawable in all available states" 2015-03-04 16:59:30 +00:00
Andrew Shulaev
63483e17de Added function to render a drawable in all available states 
Change-Id: I230cc5775a09120efe9c82a4017b001aa510ddff
 2015-03-04 16:57:06 +00:00
Chris Wren
bddb5bc846 Remove spammy notification_cancel event log. 
We also log when notifications are actually canceled,
so this only tells us how often clients cancel non-existent
notifications.  The answer: quite often.

Bug: 19599876
Change-Id: I812866cb080d51974d4db0b6e6b3eb50c3aeb560
 2015-03-04 08:48:42 -08:00
Diego Perez
e81096458f Fix crash when shadowSize is 0 
Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
 2015-03-04 16:46:21 +00:00
Adrian Roos
f855b0d2d0 Merge "Update immersive cling visuals" 2015-03-04 16:30:19 +00:00
Adrian Roos
62b65e4a8f Update immersive cling visuals 
Also enables the swipe from top gesture for revealing
the navigation bar, even if the status bar is visible.

Bug: 19282730
Change-Id: I7b562c2f0f00ff3f05b8b1e44657efe79b45f9c7
 2015-03-04 17:28:14 +01:00
Craig Mautner
83a63bac5d am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev 2015-03-04 16:09:29 +00:00
Geoff Mendal
cdcbe17a65 Merge "Import translations. DO NOT MERGE" 2015-03-04 15:33:42 +00:00
Geoff Mendal
9bf06d83ce Import translations. DO NOT MERGE 
Change-Id: Ie73169cd2ccab4f812f7cabbf30d0c0adb570c65
Auto-generated-cl: translation import
 2015-03-04 07:31:55 -08:00
Julia Reynolds
20118f18c1 Allow the device initializer to perform user setup tasks. 
A device initializer is an application that is allowed to run
during user provisioning on device owner devices. During
device provisioning (or, user provisioning of the first user
of the device), a device initializer is granted device owner
permissions. During secondary user provisioning, a device
initializer is granted profile owner permissions. Once
provisioning is complete for a user, all elevated permissions
are removed from the device initializer and the device admin
component of the app is disabled.

Bug: 19230954
Change-Id: Ib6725fb3b09bb21e4198a5dc0b445ccebb40b27e
 2015-03-04 10:25:43 -05:00
Andrei Kapishnikov
d5fe9f60b3 Merge "Replace absolute_uri with absolute_path when HTTP request is forwarded to non-proxy server." 2015-03-04 14:56:31 +00:00
Geoff Mendal
a337b60097 Merge "Import translations. DO NOT MERGE" 2015-03-04 14:55:12 +00:00
Geoff Mendal
a4f2c41ebf Import translations. DO NOT MERGE 
Change-Id: I7b7b245ade1c83878576c5e9e489a4506bfd7538
Auto-generated-cl: translation import
 2015-03-04 06:50:38 -08:00
Geoff Mendal
e901c4262b am 850fd489: (-s ours) am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '850fd489dea0cdf7199cce73027fc95658b0993f':
  Import translations. DO NOT MERGE
 2015-03-04 14:20:25 +00:00
Geoff Mendal
aee73e3d11 am 116b9336: (-s ours) am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit '116b9336e2798fdbdea1b98aa4455b485268587b':
  Import translations. DO NOT MERGE
 2015-03-04 14:20:19 +00:00
Geoff Mendal
850fd489de am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b214417a6e1a7cca5bac961c2b32b72d8baea2dd':
  Import translations. DO NOT MERGE
 2015-03-04 14:14:29 +00:00
Geoff Mendal
116b9336e2 am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb9360e36cea7c2af17992c1b08eedbce707962b':
  Import translations. DO NOT MERGE
 2015-03-04 14:14:24 +00:00
Geoff Mendal
b214417a6e am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3b9e64f3265ad146da1b9f5b523c406acd041f59':
  Import translations. DO NOT MERGE
 2015-03-04 14:08:11 +00:00
Geoff Mendal
bb9360e36c am 63069cc9: (-s ours) Import translations. DO NOT MERGE 
* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE
 2015-03-04 14:08:03 +00:00
Geoff Mendal
3b9e64f326 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e Import translations. DO NOT MERGE 
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
 2015-03-04 06:02:36 -08:00
Geoff Mendal
63069cc985 Import translations. DO NOT MERGE 
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
 2015-03-04 05:56:33 -08:00
Geoff Mendal
0e8baf3ca6 am 3e938519: (-s ours) am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '3e938519e3b11251c5eae308276a7217fb7c6572':
  Import translations. DO NOT MERGE
 2015-03-04 13:54:41 +00:00
Geoff Mendal
0d6246a660 am 97735297: (-s ours) am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '97735297307eccc3cedb537fe88a2a76d473f798':
  Import translations. DO NOT MERGE
 2015-03-04 13:54:35 +00:00
Geoff Mendal
3e938519e3 am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '80b9bd854365bf052db9572bcff0fedf74090ff5':
  Import translations. DO NOT MERGE
 2015-03-04 13:47:51 +00:00
Geoff Mendal
9773529730 am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2':
  Import translations. DO NOT MERGE
 2015-03-04 13:47:46 +00:00
Geoff Mendal
2a90c8f9c9 am 89a2b286: (-s ours) am cba2873e: (-s ours) Import translations. DO NOT MERGE 
* commit '89a2b286ae69858a999d050ac30fdf171dee6d1c':
  Import translations. DO NOT MERGE
 2015-03-04 13:44:24 +00:00
Geoff Mendal
80b9bd8543 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:42:02 +00:00
Geoff Mendal
42796e97f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:41:22 +00:00
Geoff Mendal
89a2b286ae am cba2873e: (-s ours) Import translations. DO NOT MERGE 
* commit 'cba2873edc7cba933484180109204839d68dce87':
  Import translations. DO NOT MERGE
 2015-03-04 13:37:36 +00:00
Geoff Mendal
2df38fd3f5 Import translations. DO NOT MERGE 
Change-Id: Ibbd6d3677d2e146de85bfc7130371546b31cb404
Auto-generated-cl: translation import
 2015-03-04 07:36:32 -06:00
Geoff Mendal
302132c379 Import translations. DO NOT MERGE 
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
 2015-03-04 05:35:11 -08:00
Geoff Mendal
cba2873edc Import translations. DO NOT MERGE 
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
 2015-03-04 05:29:01 -08:00
Yohann Roussel
9eafb6196d Merge "Fix handling of LOCAL_JACK_ENABLED" 2015-03-04 10:14:35 +00:00
riddle_hsu
01eb7fa7f9 [ActivityManager] Skip receiver precisely. 
Symptom:
Report broadcast ANR on a dead process.

Detail and sample:
http://code.google.com/p/android/issues/detail?id=158329

Root cause:
app.curReceiver can only remember the last running.
If an application is both receiving FG and BG broadcast,
only one of queue can discard, the remain one will still
count as timeout.

Solution:
Select the skip-tartget-receiver by comparing the skipping app
to the first record of mOrderedBroadcasts of each broadcast queues.

Change-Id: Ic68d56f21b417a34f2d30d64ecfbed09c5e1764d
 2015-03-04 17:27:05 +08:00
Jim Miller
56b8e8da2b Merge "Change fingerprint behavior in keyguard to dismiss on notification" 2015-03-04 01:34:41 +00:00
Jim Miller
25d7e51a10 Change fingerprint behavior in keyguard to dismiss on notification 
This changes fingerprint to dismiss the notification screen rather
than moving to a trusted state.

Fixes bug 19592835

Change-Id: I5020408df2e8b73a34c264b5ac052251e3a17b8d
 2015-03-03 17:12:09 -08:00
Dianne Hackborn
7d088428f3 Merge "Add new "daily stats" tracking to battery stats." 2015-03-04 00:57:54 +00:00
Andrew Wilson
cfa294ad5e Merge "Fix user switching dialog colors for television." 2015-03-03 23:52:37 +00:00