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

125635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
16858164c7 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 
* commit 'cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440':
  DO NOT MERGE - Fix keyguard pattern lockout bug
 2014-03-13 17:26:26 +00:00
Adrian Roos
cd0d8cb2d9 Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev 2014-03-13 17:22:58 +00:00
Christopher Tate
aaaeb6a21b am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit '87503f8561296fea489f8a3fe8384f61150976da':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 17:19:17 +00:00
Baligh Uddin
4c9ebc4c14 am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
  Import translations. DO NOT MERGE
 2014-03-13 17:19:14 +00:00
Joe Fernandez
f7267c8bdc Merge "Doc change: Update developer video on home page carousel." into klp-docs 2014-03-13 17:15:16 +00:00
Dianne Hackborn
08fc3a7fc2 Merge "Fix some uid issues in battery stats." 2014-03-13 17:04:54 +00:00
Dianne Hackborn
bbb7472b8e Fix some uid issues in battery stats. 
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
 2014-03-13 09:50:24 -07:00
John Spurlock
6d9b034ce1 Fix typo in public logcat page. 
Change-Id: I3b2c9ab53c305ecbb93579be474dc85462d3e2e2
 2014-03-13 12:40:12 -04:00
Baligh Uddin
a5a921e3a8 am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4545b1d29b23cbfe11aa7ca6b54f6518a38db278':
  Import translations. DO NOT MERGE
 2014-03-13 16:25:45 +00:00
Mikael Gullstrand
bbf1861fdd Null pointer exception in FileRotator.java 
Sometimes a null pointer exception is thrown when examining files
managed by the file rotator.

The logs from the test show that the Wifi state is changed a large
number of times. On every state change, a write operation is
initiated on the file system. This will eventually result in out
of memory and the call to mBasePath.list() in the maybeRotate(...)
method in FileRotator.java will return null so the iteration will
throw a NullPointerException.

Change-Id: I5d5980d9593bc9ec75281169ca27ee591809903f
 2014-03-13 17:25:01 +01:00
Ricardo Cervera
ef6c947005 Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs 2014-03-13 16:23:32 +00:00
Baligh Uddin
4545b1d29b Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-13 16:22:53 +00:00
Baligh Uddin
5468ae4125 Merge "Import translations. DO NOT MERGE" 2014-03-13 16:22:49 +00:00
Baligh Uddin
df385f2b4c Merge "Import translations. DO NOT MERGE" 2014-03-13 16:22:45 +00:00
Jaewan Kim
6a5becac37 EthernetDataTracker: Update hardware address when interface is changed 
Change-Id: I154f151ca676e1e4137eb8210fd377659cfc7867
 2014-03-14 00:43:04 +09:00
Adrian Roos
91c9561cbe DO NOT MERGE - Fix keyguard pattern lockout bug 
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
 2014-03-13 13:42:29 +00:00
Jaewan Kim
68c9d2592c Merge "EthernetDataTracker: Return proper interface name" 2014-03-13 12:07:36 +00:00
Kenny Guy
4979ff9f28 Merge "Show notifications from related users." 2014-03-13 11:57:55 +00:00
Jason Sams
21f97de0bc am 35a9e339: am fc15f899: Fix build issues from bad merge 
* commit '35a9e339687a0c5423c3433ff0c335ad9e1e0656':
  Fix build issues from bad merge
 2014-03-13 10:53:01 +00:00
Jason Sams
4a268affbf am 534606b4: am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '534606b44a865874b00fba24517a8e218ec56075':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 10:52:56 +00:00
Jason Sams
35a9e33968 am fc15f899: Fix build issues from bad merge 
* commit 'fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8':
  Fix build issues from bad merge
 2014-03-13 10:50:19 +00:00
Jason Sams
534606b44a am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '632c915ce8675033bbb7d356239d16594b26dffb':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 10:50:15 +00:00
Alan Viverette
cf2b65ce7a am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '9ebe031cdc916646e95ffcd92dde67e1655be7ba':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 10:01:39 +00:00
Alan Viverette
c25dbb50c3 am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 10:01:35 +00:00
Alan Viverette
af6288b721 am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 10:01:30 +00:00
Adam Powell
68ec033b7c am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '75958c298477a3d1e556c4fe36e516b9e828c311':
  Fix a bug in submenu presenter priority handling
 2014-03-13 10:01:15 +00:00
Alexandra Gherghina
aaebbbff73 Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps." 2014-03-13 09:31:53 +00:00
Jason Sams
457c955476 am 2ffcffd0: am 280db650: am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '2ffcffd046e321b871a04480552cef6ee4735e62':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 09:28:22 +00:00
Jason Sams
abe8dfb0e3 am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:28:19 +00:00
Jason Sams
2ffcffd046 am 280db650: am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '280db65032fe0ed6897bc33c627ae176daecb1c2':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 09:12:14 +00:00
Jason Sams
0641a5d4b1 am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '7f8a41079c342ff1f4f0ba3bf8e4f4e203da2649':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:12:09 +00:00
Alexandra Gherghina
dae57a1414 Check for empty activity stack. This avoids a null pointer exception 
when switching from an user with no open apps.

Change-Id: I02629818f2bc82ee3a2825cf484ef1e32e3e6067
 2014-03-13 08:55:56 +00:00
Jason Sams
0ebc6b378d Force merge of remaining KLP changes to fix build. 
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
 2014-03-13 01:49:05 -07:00
Jason Sams
fc15f899b8 Fix build issues from bad merge 
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
 2014-03-13 01:17:49 -07:00
Jason Sams
632c915ce8 resolved conflicts for merge of 780d57b8 to klp-modular-dev 
Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
 2014-03-13 07:40:24 +00:00
JP Abgrall
3f7f3221df ConnectivityService: add support to set TCP initial rwnd 
The value for the TCP initial receive window comes from,
in order,

kernel
  /proc/sys/net/ipv4/tcp_default_init_rwnd

init.rc (via properties)
  net.tcp.default_init_rwnd

properties
  net.tcp.default_init_rwnd

gservices
  Settings.Global.TCP_DEFAULT_INIT_RWND

Bug: 12020135
Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e
 2014-03-12 20:22:47 -07:00
Jason Sams
280db65032 am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit 'e14d5e901172559a5e18077bde3ccafd03e8a6e2':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 01:35:42 +00:00
Jason Sams
7f8a41079c am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0165db3802f0fafe0ad86b7699be7adaea6686da':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 01:35:38 +00:00
Maxim Siniavine
a305d7229f Fixes for download manager test. 
When checking that the download is in progress, check the number number
of bytes downloaded as reported by download manager, rather than looking at the file size.

When waiting for the download to complete rely on the received broadcast.

Bug: 13326931

Change-Id: I4c2431dd71e17602e758bc482be185683040ea98
 2014-03-12 18:22:02 -07:00
Dianne Hackborn
e5191aabff am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 
* commit 'a796168da0ea139fe7312678f5031cd96c50097c':
  Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4
 2014-03-13 01:15:22 +00:00
Dianne Hackborn
a796168da0 Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev 2014-03-13 01:12:13 +00:00
Jianzheng Zhou
d5c69462c6 remove unnecessary switchUser call 
If userId doesn't change, no need to do switchuser.or it will
introduce some tweak for gps modules in quick off/on because
they need cost time in off/on.

Change-Id: Ie5e408dc8be69c8a63a18bcb2cfe478cef4d70e6
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2014-03-13 09:09:22 +08:00
Jose Lima
f78e312db2 Add banner attribute to app manifest 
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
 2014-03-12 18:07:38 -07:00
Dirk Dougherty
e11f4c5f19 Doc change: Update developer video on home page carousel. 
Change-Id: Ic0cc5f38d8f8b161839585b46dbe3b3b1e1f4942
 2014-03-12 17:56:28 -07:00
Michael Wright
444b0c6b72 am f80f60ba: am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 
* commit 'f80f60ba2b61df9f9544fcae8d8bdbe5542269fc':
  Controllers must have buttons and a movement mechanism.
 2014-03-13 00:42:43 +00:00
Michael Wright
f80f60ba2b am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 
* commit 'd23d916e0fc573ccde8a622aaa42ccfae9d31f82':
  Controllers must have buttons and a movement mechanism.
 2014-03-13 00:40:03 +00:00
Michael Wright
d23d916e0f Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 2014-03-13 00:37:10 +00:00
Jeff Brown
825dd9dd38 am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 
* commit '73bd57f7abdb9eaf9239aa13945990acc6c97cd2':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-13 00:15:19 +00:00
Jeff Brown
73bd57f7ab Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev 2014-03-13 00:12:53 +00:00
John Reck
e13cf57015 Merge "Split out RenderProperties" 2014-03-13 00:09:11 +00:00