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

24081 Commits

Author SHA1 Message Date
Marvin Paul
111d166017 Merge "Implemented backup and restore for account sync settings." 2014-12-15 18:22:46 +00:00
Christopher Tate
eef1cec0ed am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
automerge: fe9e319

* commit 'fe9e3195faaa795af5fd05fab694d9f51d06e454':
  Check which file changed before requesting backup
 2014-12-13 01:15:07 +00:00
Christopher Tate
fe9e3195fa am 36ba3e47: am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '36ba3e478fbbb664a97b24723836444184c6943f':
  Check which file changed before requesting backup
 2014-12-13 01:09:03 +00:00
Christopher Tate
36ba3e478f am 90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev 
* commit '90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
  Check which file changed before requesting backup
 2014-12-13 00:59:10 +00:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00
Amith Yamasani
52d750c5c2 Check which file changed before requesting backup 
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.

Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
 2014-12-13 00:15:45 +00:00
Christopher Tate
7819d9fcf6 am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
automerge: 75070f2

* commit '75070f2f18bbbaa8065000684da64359d8545de9':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:47:36 +00:00
Christopher Tate
75070f2f18 am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 
* commit '125579caa1b4fb2de4242b0af3f4749bac9fa699':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
 2014-12-12 22:45:34 +00:00
Christopher Tate
012de64e2d Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms" 2014-12-12 22:11:16 +00:00
Svet Ganov
191dd667a0 am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
automerge: 9b3ab29

* commit '9b3ab29ffa6b3f67b5ab7c06338a2c76db59e176':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 21:06:24 +00:00
Svet Ganov
9b3ab29ffa am 26c88954: am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '26c8895465bbc94efb0cc96460e5eabe88382698':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 21:02:30 +00:00
Svet Ganov
26c8895465 am 14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 
* commit '14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c':
  Fix a NPE in AccessiiblityManagerService.
 2014-12-12 20:54:43 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Olawale Ogunwale
bfb30244fb Merge "[ActivityManager] Fix NPE when start activity" 2014-12-12 13:49:51 +00:00
minho.choo
649acab389 Fix bugs regarding delay the dispatching of non-wakeup alarms 
checkAllowNonWakeupDelayLocked() method determines that delay the dispatching of non-wakeup alarms.
(there are no wakeup alarms and the screen is off, it can delay until the future.)

if there is any pending non-wakeup alarms, non-wakeup alarm delivery time is bigger than nowELAPSED.
but, checkAllowNonWakeupDelayLocked() returns false and non-wakeup alarm is not delay until future.

i think it is necessary to reverse the inequality symbol on "mNextNonWakeupDeliveryTime > nowELAPSED"
if it isn't, Could you let me know when we get ¡°stuck in a loop¡± in the comment of checkAllowNonWakeupDelayLocked () method?

Change-Id: I7e972064547f4d0a9b4175dbd4cf735b4837abfd
Signed-off-by: Minho Choo <minho.choo@lge.com>
 2014-12-12 16:13:55 +09:00
Svet Ganov
09687064f4 Fix a NPE in AccessiiblityManagerService. 
It is possible that the accessibility windows list is null which
is treated as if there is no window information. The getWindows
method was accessing properties of the windows filed witgout a
null check.

bug:18522998

Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa
 2014-12-11 22:59:12 -08:00
Wink Saville
6cc211669c am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc 
automerge: 05e2ada

* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:45:29 +00:00
Wink Saville
05e2ada58a am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:42:38 +00:00
Wink Saville
6cc44cce0e am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 
* commit '6e04a7b65488656c4cb72d99d285050d56068112':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
 2014-12-12 04:37:40 +00:00
Marvin Paul
a6533256ac Implemented backup and restore for account sync settings. 
Bug: 18506992
Parent Bug: 17967106

Change-Id: Iecf5ce3a24ac5f12192e65aa61f1560bc76d75a8
 2014-12-12 04:35:06 +00:00
Craig Mautner
10c9c66815 am 2d6627a9: am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev automerge: 922f8e2 
* commit '2d6627a9f28c5c31fec5da3dcf48d96ff7a0d893':
  Don't apply animations to windows that are showing
 2014-12-12 04:30:39 +00:00
Craig Mautner
2d6627a9f2 am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
automerge: 922f8e2

* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
  Don't apply animations to windows that are showing
 2014-12-12 04:24:34 +00:00
Wink Saville
6e04a7b654 Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev 2014-12-12 04:22:40 +00:00
John Spurlock
281dc0aadf am 97a2be86: am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev automerge: 6f9a717 
* commit '97a2be8672febec536641fb37f4900e4402035b0':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-12 04:12:10 +00:00
John Spurlock
97a2be8672 am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-12 04:04:40 +00:00
Craig Mautner
922f8e2c0f am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev 
* commit '72b047c6c37ddf860be15b159b9a143be36d7425':
  Don't apply animations to windows that are showing
 2014-12-11 22:29:58 +00:00
Craig Mautner
72b047c6c3 Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev 2014-12-11 22:27:54 +00:00
Wink Saville
a54bf65833 Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId. 
Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
 2014-12-11 13:37:50 -08:00
Chih-hung Hsieh
17a0826e5d am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
automerge: d1aa67b

* commit 'd1aa67b8e19ae96bd2ae4e6719d13902a8b6d845':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:05:00 +00:00
Chih-hung Hsieh
d1aa67b8e1 am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:02:08 +00:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Craig Mautner
cb17f18952 Don't apply animations to windows that are showing 
If a window is showing and not obscured by the keyguard, for
example windows on other displays, don't apply the enter animation.
This prevents jank on secondary displays when the keyguard is
unlocked.

Fixes bug 18689396

Change-Id: I2deb3030e6e887f57af9a5f1d42b1c71f06f7eeb
 2014-12-11 11:24:32 -08:00
John Spurlock
6f9a71729f am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 
* commit '0537caa1e05a2f60e747559e5251f5771737c54f':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
 2014-12-11 18:34:14 +00:00
John Spurlock
0537caa1e0 Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev 2014-12-11 18:27:11 +00:00
John Spurlock
29b7872bf4 Zen: Leave zen=none on manual ringer mode stream volume changes. 
If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.

Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c
 2014-12-11 12:54:41 -05:00
Narayan Kamath
fbba3f411b am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice." 
automerge: 0602404

* commit '06024047258b01ad70f7d88e5773d8dc9b8d59fd':
  Avoid tearing down process groups twice.
 2014-12-11 10:39:09 +00:00
Narayan Kamath
0602404725 am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice." 
* commit 'bc59ca4bdbd993c1eb5c2a74f9b35857619da285':
  Avoid tearing down process groups twice.
 2014-12-11 10:35:28 +00:00
Narayan Kamath
6fe0fd69a1 am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 
* commit '15cd63027bc8413659114714068a665869a4b3b2':
  Avoid tearing down process groups twice.
 2014-12-11 10:34:09 +00:00
Paul Jensen
87dfb9ec25 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc 
automerge: 8f58207

* commit '8f58207319fc2b73f83874892a544f8cf59cf7e9':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 10:25:47 +00:00
Narayan Kamath
3146212878 Merge "Avoid tearing down process groups twice." 2014-12-11 09:15:06 +00:00
Narayan Kamath
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +00:00
Paul Jensen
8f58207319 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 05:49:18 +00:00
Paul Jensen
d9d48cc9c7 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 04:55:52 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Amith Yamasani
ac3c4e0c6c am 2467188e: am a2530e4a: am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit '2467188e396503988ea05401011837a18f9a93a1':
  Stop guest user on exiting, to conserve resources
 2014-12-11 01:39:49 +00:00
Dianne Hackborn
0a167c87b4 am 5e0550f4: am dc1e9f48: am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit '5e0550f48e73490e84ef2c5acdf266c7814c1294':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-11 01:38:43 +00:00
Jason Monk
ccec890f49 am 3b4ccabc: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev automerge: 65c08ec 
* commit '3b4ccabc06578a70adb2c0c748ded0410b26a763':
  Handle policy change while keyguard disabled
 2014-12-11 01:38:16 +00:00
Amith Yamasani
2467188e39 am a2530e4a: am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'a2530e4aa4c35787516ffea8368c0ebc35da4df4':
  Stop guest user on exiting, to conserve resources
 2014-12-11 00:24:26 +00:00
Dianne Hackborn
5e0550f48e am dc1e9f48: am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit 'dc1e9f4813c61354f7e7459708684e4241b12e90':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-11 00:07:26 +00:00
Jason Monk
a349a9e71a am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:53 +00:00