summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-31merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devandroid-6.0.1_r32marshmallow-dr-dragon-release-MayThe Android Automerger
2016-03-29merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devThe Android Automerger
2016-03-29merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devThe Android Automerger
2016-03-28[DO NOT MERGE] Disallow guest user from changing Wifi settingsSamuel Tan
Disallow existing and newly created guest users from changing Wifi settings. BUG: 27411179 TEST: Flashed device, switched to existing guest user, and verified that Wifi settings are disabled. TEST: Flashed device, created new guest user, and verified that Wifi settings are disabled. Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3 (cherry picked from commit d8c3ca43163427a75c8b70114096238177f97af0)
2016-03-06merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devThe Android Automerger
2016-03-01DO NOT MERGE ANYWHERE: Hack to get devices booting again.android-6.0.1_r31Jeff Sharkey
If we try scheduling a pass before the system is ready, record a pending event and dispatch once we're actually ready. Bug: 26863668 Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc (cherry picked from commit 538c11cf2175d4e30337e8776401bfede85866be) (cherry picked from commit 558f09fcf6766d593b372e6df5adc3090fa4629a)
2016-03-01DO NOT MERGE ANYWHERE: Don't change screen on time on time changesAdam Lesinski
Screen on time should be measured in elapsed realtime, not wallclock. Cause a checkIdleStates to occur when reloading stats (on rollover and on time change). When time changes occur in the negative direction, the new stats file we create can overlap the previous one with regards to its end timestamp. Use the begin timestamp to determine which of the latest stats to merge. (b/22716352) Bug: 26488100 Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7 (cherry picked from commit 9d89bd5cb891dbc9b45b72aa291cbb9fc39b023c)
2016-03-01DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for ↵Adam Lesinski
app idle Ignores the old, re-appropriated key "idle_duration" which is now set to a high value in order to force disable app idle on devices with bug b/26355386 Bug:26355386 Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090 (cherry picked from commit 1559fed4c47a4bd219e61f7d34e50d46b8929f8a)
2016-03-01DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for ↵Adam Lesinski
first time would cause crash With the updated rolling window of stats for app idleness, we need to make sure it is populated before we initialize some defaults. Now that we look at older entries to figure out idleness, if those entries are in the future (due to time change), set them to the current screen on time. Bug:26504153 Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69 (cherry picked from commit 2bd90c6abce3e43af6db4eaa7a34459e8341b3a0)
2016-03-01DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)Andre Eisenbach
Interop database entries are stored in the system settings entry "BluetoothInteropDatabase". The format is a list of entries separated by ";". An entry consists of a BDA fragment, followed by a comma and an integer representing a feature from interop.h. Example: To disable LE secure connections for devices starting with BDA 11:22:33, use "11:22:33,0". Bug: 26548845 Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949 (cherry picked from commit 3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7) (cherry picked from commit a39373cabd99687f9acd8ff57d53d644dfc9ffe7)
2016-03-01DO NOT MERGE Bluetooth: Restrict gain for Absolute volume caseLiejun Tao
For the lowest music volume steps 1 and 2, restrict the gain to 50% and 75%. This will avoid the lowest volume steps being too loud for some accessories. For music volume 0, set phone gain to 0 as some accessories won't mute on their end. Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f Signed-off-by: Liejun Tao <baibai@motorola.com> (cherry picked from commit 9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57)
2016-03-01Fix missing observer reply callbacksAmith Yamasani
This was causing upto 2 seconds in user switching delay. Bug: 25813588 Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc (cherry picked from commit dbb75248b19366d76cfdd7d4536d68467e7322c1)
2016-03-01Exit getAllValidScorers early if not the primary.Jeremy Joslin
This fixes the crash that occurs when getAllValidScorers() is invoked by a non-primary user when a scorer is active. BUG: 23040221 Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7 (cherry picked from commit 5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76) (cherry picked from commit 44d550c2d1343887371d9013e202c3436d621dad)
2016-03-01DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.Dan Sandler
Never attribute to malice that which is adequately explained by a bug, particularly one involving date math. Bug: 26326394 Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8 (cherry picked from commit 8d9aea8a1870ad83d9eccba1068a1685da5e96d0) (cherry picked from commit e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9)
2016-03-01DO NOT MERGE Check apps idle states on time changesAmith Yamasani
And ensure that the listeners are informed of app standby transitions that might occur during time changes. Fix for apps that sometimes don't have network access until reboot. Bug: 26488100 Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23 (cherry picked from commit c465e71cdc401e1565c29a895a5c6d366ba5344c) (cherry picked from commit 35664f25ae005a935adaf53db78f28cdd5c52504)
2016-03-01DO NOT MERGE Fix for syncs being dropped when appIdle is onShreyas Basarge
Syncs were being dropped when appIdleMode was on for an app. This CL backs off the sync instead of dropping it. When the app becomes non-idle, backoff is cleared and the sync is performed. Bug: 26355386 Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1 (cherry picked from commit 2c051498b2b0e2608740d906e70867b74083107d) (cherry picked from commit a42a8926309bceb438556b216074eb815cae28f2)
2016-03-01DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover timeAdam Lesinski
App Idle queries are very frequent and so they only check in memory stats. However, in memory stats can be missing some entries, especially after a rollover, but also due to a larger bug fixed in master (too risky to take now). The fix is to do a deep query (reading older files from disk) and maintain a parallel cache of stats for app idle. That way the rolling window of data required to serve app idle queries stays in memory. Bug:26355386 Change-Id: I6a29bbc25214f6a3c2f24c8c079936e66f99e42e (cherry picked from commit 9c7b543325db1a6f8913403ec3a5cbe041b25043)
2016-03-01Redact Account info from getCurrentSyncsMatthew Williams
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) (cherry picked from commit f39549e389edf62f43bacd95a1b8580d75ad77ed)
2016-03-01NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05Shreyas Basarge
am: 58048c1f17 * commit '58048c1f17d54166c6a048af2365d17dd32f4d57': NPE fix for SyncStorageEngine read authority (cherry picked from commit cddfdac381f40821688a2021c1acf3b2d755741b) Change-Id: I0f6ce2a837eb5fe1daec2c57bcc15c20d06848fe
2016-03-01DO NOT MERGE ANYWHERE: Hack to get devices booting again.Jeff Sharkey
If we try scheduling a pass before the system is ready, record a pending event and dispatch once we're actually ready. Bug: 26863668 Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc (cherry picked from commit 538c11cf2175d4e30337e8776401bfede85866be) (cherry picked from commit 558f09fcf6766d593b372e6df5adc3090fa4629a)
2016-03-01DO NOT MERGE ANYWHERE: Don't change screen on time on time changesAdam Lesinski
Screen on time should be measured in elapsed realtime, not wallclock. Cause a checkIdleStates to occur when reloading stats (on rollover and on time change). When time changes occur in the negative direction, the new stats file we create can overlap the previous one with regards to its end timestamp. Use the begin timestamp to determine which of the latest stats to merge. (b/22716352) Bug: 26488100 Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7 (cherry picked from commit 9d89bd5cb891dbc9b45b72aa291cbb9fc39b023c)
2016-03-01DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for ↵Adam Lesinski
app idle Ignores the old, re-appropriated key "idle_duration" which is now set to a high value in order to force disable app idle on devices with bug b/26355386 Bug:26355386 Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090 (cherry picked from commit 1559fed4c47a4bd219e61f7d34e50d46b8929f8a)
2016-03-01Merge "DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data ↵Addison Nuding
for first time would cause crash" into mnc-dr-ryu-dev
2016-03-01Merge "Fix missing observer reply callbacks" into mnc-dr-ryu-devAddison Nuding
2016-03-01Merge "Exit getAllValidScorers early if not the primary." into mnc-dr-ryu-devAddison Nuding
2016-03-01Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next ↵Addison Nuding
alarm." into mnc-dr-ryu-dev
2016-03-01Merge "DO NOT MERGE Read Bluetooth interop database entries from settings ↵Addison Nuding
(1/2)" into mnc-dr-ryu-dev
2016-03-01Merge "DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case" into ↵Addison Nuding
mnc-dr-ryu-dev
2016-03-01Merge "Redact Account info from getCurrentSyncs" into mnc-dr-ryu-devAddison Nuding
2016-03-01Merge "NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: ↵Addison Nuding
339c4f2b05 am: 58048c1f17" into mnc-dr-ryu-dev
2016-03-01Merge "DO NOT MERGE Check apps idle states on time changes" into mnc-dr-ryu-devAddison Nuding
2016-03-01DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for ↵Adam Lesinski
first time would cause crash With the updated rolling window of stats for app idleness, we need to make sure it is populated before we initialize some defaults. Now that we look at older entries to figure out idleness, if those entries are in the future (due to time change), set them to the current screen on time. Bug:26504153 Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69 (cherry picked from commit 2bd90c6abce3e43af6db4eaa7a34459e8341b3a0)
2016-03-01Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into ↵Addison Nuding
mnc-dr-ryu-dev
2016-02-27DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)Andre Eisenbach
Interop database entries are stored in the system settings entry "BluetoothInteropDatabase". The format is a list of entries separated by ";". An entry consists of a BDA fragment, followed by a comma and an integer representing a feature from interop.h. Example: To disable LE secure connections for devices starting with BDA 11:22:33, use "11:22:33,0". Bug: 26548845 Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949 (cherry picked from commit 3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7) (cherry picked from commit a39373cabd99687f9acd8ff57d53d644dfc9ffe7)
2016-02-27DO NOT MERGE Bluetooth: Restrict gain for Absolute volume caseLiejun Tao
For the lowest music volume steps 1 and 2, restrict the gain to 50% and 75%. This will avoid the lowest volume steps being too loud for some accessories. For music volume 0, set phone gain to 0 as some accessories won't mute on their end. Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f Signed-off-by: Liejun Tao <baibai@motorola.com> (cherry picked from commit 9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57)
2016-02-27Fix missing observer reply callbacksAmith Yamasani
This was causing upto 2 seconds in user switching delay. Bug: 25813588 Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc (cherry picked from commit dbb75248b19366d76cfdd7d4536d68467e7322c1)
2016-02-27Exit getAllValidScorers early if not the primary.Jeremy Joslin
This fixes the crash that occurs when getAllValidScorers() is invoked by a non-primary user when a scorer is active. BUG: 23040221 Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7 (cherry picked from commit 5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76) (cherry picked from commit 44d550c2d1343887371d9013e202c3436d621dad)
2016-02-27DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.Dan Sandler
Never attribute to malice that which is adequately explained by a bug, particularly one involving date math. Bug: 26326394 Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8 (cherry picked from commit 8d9aea8a1870ad83d9eccba1068a1685da5e96d0) (cherry picked from commit e79c73d6267681dbbc8bd4eccf9a79e3017f6fe9)
2016-02-27DO NOT MERGE Check apps idle states on time changesAmith Yamasani
And ensure that the listeners are informed of app standby transitions that might occur during time changes. Fix for apps that sometimes don't have network access until reboot. Bug: 26488100 Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23 (cherry picked from commit c465e71cdc401e1565c29a895a5c6d366ba5344c) (cherry picked from commit 35664f25ae005a935adaf53db78f28cdd5c52504)
2016-02-27DO NOT MERGE Fix for syncs being dropped when appIdle is onShreyas Basarge
Syncs were being dropped when appIdleMode was on for an app. This CL backs off the sync instead of dropping it. When the app becomes non-idle, backoff is cleared and the sync is performed. Bug: 26355386 Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1 (cherry picked from commit 2c051498b2b0e2608740d906e70867b74083107d) (cherry picked from commit a42a8926309bceb438556b216074eb815cae28f2)
2016-02-27DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover timeAdam Lesinski
App Idle queries are very frequent and so they only check in memory stats. However, in memory stats can be missing some entries, especially after a rollover, but also due to a larger bug fixed in master (too risky to take now). The fix is to do a deep query (reading older files from disk) and maintain a parallel cache of stats for app idle. That way the rolling window of data required to serve app idle queries stays in memory. Bug:26355386 Change-Id: I6a29bbc25214f6a3c2f24c8c079936e66f99e42e (cherry picked from commit 9c7b543325db1a6f8913403ec3a5cbe041b25043)
2016-02-27Redact Account info from getCurrentSyncsMatthew Williams
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) (cherry picked from commit f39549e389edf62f43bacd95a1b8580d75ad77ed)
2016-02-26NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05Shreyas Basarge
am: 58048c1f17 * commit '58048c1f17d54166c6a048af2365d17dd32f4d57': NPE fix for SyncStorageEngine read authority (cherry picked from commit cddfdac381f40821688a2021c1acf3b2d755741b) Change-Id: I0f6ce2a837eb5fe1daec2c57bcc15c20d06848fe
2016-02-01Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I71d468844a82ab03e064f15a090402a57ea21e43 Auto-generated-cl: translation import
2016-01-25DO NOT MERGE Check permissions on getDeviceId.android-6.0.1_r18Robert Greenwalt
This needs the package name passed in, so the aidl changes. bug:25778215 Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360 (cherry picked from commit d8231b9f37b8a4b9eb160c7e8aae0105c978fc11)
2016-01-22DO NOT MERGE Check permissions on getDeviceId.Robert Greenwalt
This needs the package name passed in, so the aidl changes. bug:25778215 Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360 (cherry picked from commit d8231b9f37b8a4b9eb160c7e8aae0105c978fc11)
2016-01-19merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devThe Android Automerger
2016-01-15merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devandroid-6.0.1_r16The Android Automerger
2016-01-07merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-devThe Android Automerger
2016-01-06DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung
Sample decoding still occurs in SoundPoolThread without holding the SoundPool lock. Bug: 25781119 Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8 (cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 01:14:13 +0000