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

124657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
1f3c72c5e2 Merge "Detach disappearing children in onDetach" 2014-03-06 00:35:14 +00:00
John Reck
ca7a9da76d Detach disappearing children in onDetach 
Bug: 13324881

Change-Id: Iba6501b164842c5786a6f4763e334e6c80c6fa41
 2014-03-06 00:31:34 +00:00
Christopher Tate
9941a289b7 Merge "am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev" 2014-03-06 00:19:14 +00:00
Christopher Tate
ff8b037c10 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
 2014-03-05 16:17:34 -08:00
Robert Greenwalt
ea3bfc68ea am 2d07e8d6: am c1ca3bac: am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '2d07e8d60e44e320b0c39d63e763d79a7befadf3':
  Only apply tcp buffer sizes for default net
 2014-03-06 00:14:30 +00:00
Christopher Tate
bba8fbc9bd am 943cdf7e: (-s ours) am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '943cdf7e221b867978416024526fe851c248972d':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-06 00:14:27 +00:00
John Reck
2665f6e9f5 Merge "Remove invalid usage of DisplayList.isValid()" 2014-03-06 00:07:29 +00:00
John Reck
7558aa7081 Remove invalid usage of DisplayList.isValid() 
Bug: 13324734

 Editor was using isValid as a mechanism to track whether or not it
 needed to re-record the DisplayList. This is not correct as isValid()
 is not a general-purpose dirty bit. Add an explicit dirty bit for
 Editor to use instead

Change-Id: I5608b151791870fca3681056b5507bd39ee48f52
 2014-03-05 15:01:04 -08:00
John Spurlock
1f97d0ae87 Balance calls to setStreamMute. 
Otherwise can get into a situation where ringer volume appears
permanently muted (until reboot).

Change-Id: I58c09f68dc02cba4de72e3a024b72484b9b9bc82
 2014-03-05 17:36:24 -05:00
Svetoslav
dd2ce3448b Merge "Allow click listener registration in NumberPicker." 2014-03-05 22:35:13 +00:00
Robert Greenwalt
2d07e8d60e am c1ca3bac: am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'c1ca3bac5d35a029003e839ccccf66b028739aaf':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:20:58 +00:00
Christopher Tate
943cdf7e22 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 22:20:56 +00:00
Robert Greenwalt
c1ca3bac5d am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bf9eec4c3bbbacd0954d819c18709962a81338bf':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:17:24 +00:00
Christopher Tate
777b8a808e am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '422b2656741520448815b230f7c73ad67a4c4e95':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 22:17:21 +00:00
Robert Greenwalt
bf9eec4c3b am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '1c8ba7e551274782f3f61b90807711a056cc9730':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:14:46 +00:00
Jake Hamby
322f7d6e4a Merge "Add get/setPreferredNetworkType() for OMA DM client." 2014-03-05 21:53:35 +00:00
John Spurlock
8c7d4180e9 Merge "Block calls in limited interruptions mode." 2014-03-05 21:24:14 +00:00
John Spurlock
c323b8d4d6 Block calls in limited interruptions mode. 
Calls should be blocked by default in this mode, not allowed.

Change-Id: Ia628389857c5df90cec820efd0ca81e1d949631e
 2014-03-05 16:18:04 -05:00
Santos Cordon
8a84205ae2 Merge "Updating wording around PROCESS_INCOMING_CALL." 2014-03-05 21:17:16 +00:00
John Reck
8f649dda50 Merge "DisplayList lifecycle fixes" 2014-03-05 21:05:39 +00:00
John Reck
eef19cc2ee DisplayList lifecycle fixes 
Bug: 13324014
 Bug: 13324861

 Don't use a DisplayList for the background if the View is detached.
 mAttachInfo can be null in onDetachedFromWindow

Change-Id: I6d1413b956dd35cd2f5256860223013d2a570870
 2014-03-05 13:02:00 -08:00
Christopher Tate
422b265674 resolved conflicts for merge of c45ff35f to klp-modular-dev 
Change-Id: Id1799e49891dc72e2e9c55fd9f418ceee94a7875
 2014-03-05 12:28:04 -08:00
Brian Carlstrom
aa1d023bb9 am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 20:09:52 +00:00
Brian Carlstrom
674fd6c442 am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit 'a258b4a9e8a519c3b181848c9b8fb2f0e2142d8f':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 20:04:21 +00:00
Brian Carlstrom
a258b4a9e8 am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 19:29:40 +00:00
Brian Carlstrom
485e3b4594 am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '5c126c3d1703d8bef9a55dcc01f1fabf17811f60':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 11:26:44 -08:00
Brian Carlstrom
5c126c3d17 Merge "Add dex2oat-flags plumbing to AndroidRuntime" 2014-03-05 19:23:48 +00:00
Mike Lockwood
216ce34d04 Merge "Remove non-existent classes from preloaded-classes" 2014-03-05 18:59:06 +00:00
Tom O'Neill
fc1fa64020 Merge "Remove reference to internal bug number" 2014-03-05 18:41:47 +00:00
Robert Greenwalt
1c8ba7e551 am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bad3a9e66fb103ec96ea89ce9eff7270333d5926':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:31:18 +00:00
Robert Greenwalt
bad3a9e66f am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '2d1e8c49582fb91df0a05a778c228fc1cd89e026':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:27:03 +00:00
Robert Greenwalt
2d1e8c4958 Merge "Only apply tcp buffer sizes for default net" into klp-dev 2014-03-05 18:23:56 +00:00
Brian Attwell
48d04ec3b7 Merge "Add IN_DEFAULT_DIRECTORY to contract" 2014-03-05 17:39:27 +00:00
John Reck
24ba99c235 Merge "DisplayList overhaul" 2014-03-05 17:00:54 +00:00
Kenny Guy
e17bbad521 Merge "Fix bug with starting users in background." 2014-03-05 16:56:41 +00:00
Kenny Guy
264707caa3 Fix bug with starting users in background. 
It shouldn't tell the window manager to lock or freeze the
screen when starting a user in the background.

Change-Id: I24c6c19a20c360ecbed7d28e1d7249c025a463b9
 2014-03-05 15:40:10 +00:00
Santos Cordon
b4aeac7305 Updating wording around PROCESS_INCOMING_CALL. 
bug: 12175514

Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
 2014-03-04 18:51:18 -08:00
Alan Viverette
4b131046aa Revert "Revert "Fix the build."" 
WE MUST GO DEEPER

This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44.

Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
 2014-03-05 02:09:32 +00:00
Alan Viverette
9e0c0a6e97 Revert "Fix the build." 
This reverts commit 737629a346e953f5506672834e466acbb06caf39.

Change-Id: If3775b57f343094d343991e964faa202748d0236
 2014-03-05 02:08:29 +00:00
Alan Viverette
737629a346 Fix the build. 
Change-Id: If6c301de541750ef76572879facc2c1f8f2c5855
 2014-03-04 17:43:25 -08:00
Brian Attwell
2fa85d383d Add IN_DEFAULT_DIRECTORY to contract 
I want to expose this flag so that gmail can sort
based on it. Plus, it provides generally useful information.

Bug: 13173524
Change-Id: I93a35f8822b55f97b15e1fbb783110e3674c1622
 2014-03-04 17:41:13 -08:00
Alan Viverette
9e97fcba6a Merge "Add lower density assets for Quantum" 2014-03-05 01:23:17 +00:00
Christopher Tate
d4f30319ad am 31aa0772: am 7a4e519e: am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '31aa077226b8d9d65d351ddb92a01273d9830070':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:11:53 +00:00
Christopher Tate
31aa077226 am 7a4e519e: am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '7a4e519eda4e0e7bac9ad0159b29b11f61b50e01':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:08:46 +00:00
Christopher Tate
7a4e519eda am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '8106dce705ba69d5bc0ccafa8e21068216f42a5f':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:05:31 +00:00
Christopher Tate
8106dce705 am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'a6c59158761423551941f6ed338a117658e581ad':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:00:50 +00:00
Christopher Tate
c45ff35f21 am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1efc6e52d65389463ad52c32df02d68493df0f48':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:57:22 +00:00
Christopher Tate
a6c5915876 am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:57:18 +00:00
Christopher Tate
1efc6e52d6 am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1d13f13deac644bddbae8a1f92642074a32d7a6c':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:54:17 +00:00
Christopher Tate
f63ae644a8 am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:54:14 +00:00