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

24063 Commits

Author SHA1 Message Date
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
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
Jason Monk
3b4ccabc06 am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
automerge: 65c08ec

* commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236':
  Handle policy change while keyguard disabled
 2014-12-11 00:06:21 +00:00
Amith Yamasani
a2530e4aa4 am ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 
* commit 'ee24d848a5f270fb2d18150ab14200e62c9fd118':
  Stop guest user on exiting, to conserve resources
 2014-12-10 23:18:26 +00:00
Amith Yamasani
ee24d848a5 Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev 2014-12-10 22:54:29 +00:00
Benjamin Franz
88daefb948 am 16d73a75: am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev automerge: df55bf4 
* commit '16d73a752e9ee937c39be4ce2da5411cf1af0c5c':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 22:23:21 +00:00
Amith Yamasani
6f96a44df3 Stop guest user on exiting, to conserve resources 
Bug: 18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
 2014-12-10 14:21:48 -08:00
Svet Ganov
7132a5b47c am a3bc48c8: am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev automerge: a706c90 
* commit 'a3bc48c863f69bc048cafbae1e8ff53d53ac6b8e':
  Ignore accessibility overlay when computing window's interactive region.
 2014-12-10 22:00:06 +00:00
John Spurlock
5eb898e752 am 9e5e1cf2: am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev automerge: 24ca556 
* commit '9e5e1cf2bb62d6cfc6d97191c92848a610b3a4d9':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 21:59:56 +00:00
Dianne Hackborn
cb05679a18 am f85a91e4: am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev automerge: d525891 
* commit 'f85a91e408a0da3799fe1701f450b71e20b68c80':
  Further work on issue #18640385: Add procstats test mode
 2014-12-10 21:59:51 +00:00
Dianne Hackborn
dc1e9f4813 am e207ffe0: Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 
* commit 'e207ffe01d3e9185f2cac9501354a5236abcedad':
  Fix issue #18683980: questions on LMK memory changes
 2014-12-10 21:59:39 +00:00
Erik Kline
0bf20bea81 am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f 
* commit '34b3b53f9c21346282cb889363024fa4c7bb558d':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 21:58:42 +00:00
Craig Mautner
38b5d057f0 am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2':
  Only one task within the stack should moveToBack
 2014-12-10 21:57:22 +00:00
Dianne Hackborn
e207ffe01d Merge "Fix issue #18683980: questions on LMK memory changes" into lmp-mr1-dev 2014-12-10 21:56:08 +00:00
Amith Yamasani
e289aafae9 am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 automerge: 7acd880 
* commit 'f1ffc75c9ec093ff780954f86c72a8a7069ca6cf':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 21:32:57 +00:00
Jason Monk
65c08ec82a am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 
* commit '4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
  Handle policy change while keyguard disabled
 2014-12-10 21:11:30 +00:00
Jason Monk
4ef9edeb67 Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev 2014-12-10 21:04:27 +00:00
Benjamin Franz
16d73a752e am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 
automerge: df55bf4

* commit 'df55bf45e8ebcf699b9b4574db9119809935c549':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 20:36:22 +00:00
Benjamin Franz
df55bf45e8 am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev 
* commit 'a96ba381cf7ecbed31da94b8ebc93da3c42151ad':
  Only add successfully bound profile services to mProfileServices.
 2014-12-10 20:34:36 +00:00