Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,803 Commits 3 Branches 0 Tags
0147afa7422331b4fff91d20580e013d293f12ab
Commit Graph

103803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
0147afa742 am 2e24cbf8: am e0b39fc1: Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 
* commit '2e24cbf802e43644188aa0f7c35754eddac9ad23':
  Account for hairlines in quick rejection logic
 2013-04-03 13:55:23 -07:00
Chris Craik
2e24cbf802 am e0b39fc1: Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 
* commit 'e0b39fc18c10224c4e66f70aa472d8497b1b4621':
  Account for hairlines in quick rejection logic
 2013-04-03 13:50:19 -07:00
Kenny Root
38b4e753ec am 7c15eca0: am a7e4795b: Merge "Remove keystore entries when package removed" 
* commit '7c15eca06f482d77e190c1575bd335ebe14216c2':
  Remove keystore entries when package removed
 2013-04-03 13:48:13 -07:00
Andreas Huber
9c2be9bcb7 am 9a1ff831: am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 
* commit '9a1ff831b755c22e26107a8f446ed02fbde5ccb5':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
 2013-04-03 13:48:10 -07:00
Craig Mautner
621519e8ff am 8d1a32a4: Merge commit \'ddc16ef4387ca25c607348f6155771f17a049763\' into bogus 
* commit '8d1a32a413530b37dd382fa53fc990d028770e9e':
  Fix potential deadlock between LockScreen and WindowManagerService
 2013-04-03 13:48:08 -07:00
Kenny Root
7c15eca06f am a7e4795b: Merge "Remove keystore entries when package removed" 
* commit 'a7e4795bb35986164294e6f7ef56e31c9de0c06d':
  Remove keystore entries when package removed
 2013-04-03 13:38:37 -07:00
Andreas Huber
9a1ff831b7 am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 
* commit 'c9a1ca3c1a9f8591b675b980c1e390be8d901b39':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
 2013-04-03 13:38:34 -07:00
Craig Mautner
8d1a32a413 Merge commit 'ddc16ef4387ca25c607348f6155771f17a049763' into bogus 2013-04-03 13:14:30 -07:00
Baligh Uddin
5178b48720 Merge "Import translations. DO NOT MERGE" 2013-04-03 19:51:54 +00:00
Chris Craik
e0b39fc18c Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev 2013-04-03 19:43:47 +00:00
Baligh Uddin
5d3ca394e5 am f523ee8e: am bc9da0f4: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'f523ee8ea6a4b38f4d42e1d4b5a4da7493a8d31c':
  Import translations. DO NOT MERGE
 2013-04-03 12:40:40 -07:00
Kenny Root
2aeb228989 am 6812059b: am d72317ab: Remove keystore entries when package removed 
* commit '6812059b2d4aecb732ce3c94c58f2494ddc4ff6a':
  Remove keystore entries when package removed
 2013-04-03 12:40:37 -07:00
Baligh Uddin
f523ee8ea6 am bc9da0f4: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'bc9da0f4b5584d52b966b445deb2c4f9d87dd070':
  Import translations. DO NOT MERGE
 2013-04-03 12:35:47 -07:00
Kenny Root
6812059b2d am d72317ab: Remove keystore entries when package removed 
* commit 'd72317abd79ddf95d48c8f35bf1070900ff55b5e':
  Remove keystore entries when package removed
 2013-04-03 12:35:43 -07:00
Baligh Uddin
bc9da0f4b5 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-03 19:28:17 +00:00
Kenny Root
d72317abd7 Remove keystore entries when package removed 
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.

(cherry picked from commit 95e3ee3971)

Bug: 3020069
Change-Id: I374258ccc103f8cb3e238f2bf0d1afda0659db94
 2013-04-03 11:32:52 -07:00
Kenny Root
a7e4795bb3 Merge "Remove keystore entries when package removed" 2013-04-03 18:29:24 +00:00
Scott Kennedy
7ee8002aab resolved conflicts for merge of b5d6b3fe to master 
Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b
 2013-04-03 11:15:50 -07:00
Craig Mautner
00633e0270 Merge "Move startActivityUncheckedLocked to Supervisor" 2013-04-03 17:59:21 +00:00
Craig Mautner
4f42c174ad Merge "Move startActivity from ActivityStack to Supervisor" 2013-04-03 17:57:57 +00:00
Chris Craik
e7c69c6fe3 Account for hairlines in quick rejection logic 
bug:8531373
Change-Id: I35444014f23fc61da687694fccc0d13bce718793
 2013-04-03 09:55:48 -07:00
Scott Kennedy
b5d6b3fec0 am 688c3344: am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '688c33448572fa3879b1486d8fa1bf16cd946211':
  docs: Typos and other fixes
 2013-04-03 09:42:06 -07:00
Scott Kennedy
688c334485 am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '23eda7cd0a2b80bafcba7c24f49a73a2f11f782f':
  docs: Typos and other fixes
 2013-04-03 09:38:49 -07:00
Scott Kennedy
23eda7cd0a am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '76f9a0a6800d8a8945156a95dea79f16ec704b3d':
  docs: Typos and other fixes
 2013-04-03 09:35:18 -07:00
Scott Kennedy
76f9a0a680 am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'c318dbcf358772ab53b0380edb3e487a773ad2d8':
  docs: Typos and other fixes
 2013-04-03 09:31:32 -07:00
Scott Kennedy
c318dbcf35 am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '2dd01a0b5b08a0ccd7b2932707ce58dd959ac3f8':
  docs: Typos and other fixes
 2013-04-03 09:27:46 -07:00
Scott Kennedy
2dd01a0b5b am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '555c82cd43ef8d11bcf54f023864619869c06411':
  docs: Typos and other fixes
 2013-04-03 09:24:42 -07:00
Scott Kennedy
555c82cd43 am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e':
  docs: Typos and other fixes
 2013-04-03 09:20:38 -07:00
Scott Kennedy
f7c06ddbfc Merge "docs: Typos and other fixes" into jb-mr1-dev 2013-04-03 16:16:35 +00:00
Baligh Uddin
6c61a9cd2f Import translations. DO NOT MERGE 
Change-Id: Id1c70c846d44c081145c0a2cfeaeef4f4baca5a4
Auto-generated-cl: translation import
 2013-04-03 09:11:23 -07:00
Andreas Huber
c9a1ca3c1a Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 2013-04-03 16:09:16 +00:00
Baligh Uddin
572c241047 Import translations. DO NOT MERGE 
Change-Id: I75964c44ea483a91bc9e4be7433055be4cca57cf
Auto-generated-cl: translation import
 2013-04-03 09:02:22 -07:00
Craig Mautner
3361c7dfc4 Merge "Fix potential synch problems." 2013-04-03 15:41:36 +00:00
Craig Mautner
3ee1a66c1e Merge "Perform activityIdleInternal in correct order." 2013-04-03 05:40:08 +00:00
Craig Mautner
8be5ea3bdb Perform activityIdleInternal in correct order. 
Refactor of ActivityManagerService.activityIdle left
activityIdleInternalLocked called only if stopProfiling was true.
Calling it in all situations is the correct behavior.

Fixes bug 8532130.

Change-Id: Ibd7f112bab104094ff1b1f3a2fb8c03b527ec453
 2013-04-02 22:37:45 -07:00
Lorenzo Colitti
3131580086 am 92871140: am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev 
* commit '92871140e2f667743212bdbe418aa833142b73bb':
  Fix LinkProperties's equals() method.
 2013-04-02 22:35:48 -07:00
Lorenzo Colitti
92871140e2 am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev 
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
  Fix LinkProperties's equals() method.
 2013-04-02 22:32:34 -07:00
Lorenzo Colitti
6c2e8fb4d5 Merge "Fix LinkProperties's equals() method." into jb-mr2-dev 2013-04-03 05:28:52 +00:00
Jeff Brown
fc00755627 am 4c20e618: am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender. 
* commit '4c20e61808a75f217e99b589261821ca453cea1b':
  Fix reference cycle in InputEventReceiver and Sender.
 2013-04-02 20:08:01 -07:00
Jeff Brown
4c20e61808 am a4ca8ea0: Fix reference cycle in InputEventReceiver and Sender. 
* commit 'a4ca8ea0ad14c509d1ced46482e83c1b8a518982':
  Fix reference cycle in InputEventReceiver and Sender.
 2013-04-02 20:05:03 -07:00
Justin Koh
ab089d4870 am 9d4ed1ec: am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev 
* commit '9d4ed1ec62a392e4b73ab7d3cd548e09bc792ab2':
  Add global key configuration file
 2013-04-02 19:25:27 -07:00
Jim Miller
f0426c6a44 am e884f6b8: am dbd9c337: Merge "Change time format for default clock in keyguard" into jb-mr2-dev 
* commit 'e884f6b8505520f6f745cc51358154bf5d89f101':
  Change time format for default clock in keyguard
 2013-04-02 19:25:17 -07:00
kmccormick
87290ccdc2 am 5da78408: am 75022d1d: am 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs 
* commit '5da7840887e2314faea451222a9721adf972f0b4':
  Doc update: Misc doc bugs
 2013-04-02 19:25:14 -07:00
Jeff Brown
a4ca8ea0ad Fix reference cycle in InputEventReceiver and Sender. 
If the receiver or sender was not properly disposed, then
the underlying input channel might be leaked because the
native peer was holding a strong reference to the object.

Switched to using a weak reference.

Also updated Binder to use a new helper created for this purpose.

Change-Id: I19680bf96d0548777bff02aa1d91874d1e8e41da
 2013-04-02 18:59:15 -07:00
Justin Koh
9d4ed1ec62 am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev 
* commit 'ddd168d65f0bc9644434d18dd82fe6c994670dba':
  Add global key configuration file
 2013-04-02 18:17:01 -07:00
Justin Koh
ddd168d65f Merge "Add global key configuration file" into jb-mr2-dev 2013-04-03 01:11:53 +00:00
Justin Koh
d378ad74c6 Add global key configuration file 
Add global key configuration file. A global key is one that is handled by
PhoneWindowManager before dispatching and sent to a given component via
broadcast instead of going to the foreground app.
Bug: 8510681

Change-Id: Ic6a8e559680d005613ed22874b27eb78bbfc4499
 2013-04-02 18:09:27 -07:00
Jim Miller
e884f6b850 am dbd9c337: Merge "Change time format for default clock in keyguard" into jb-mr2-dev 
* commit 'dbd9c337eddadccc04d4b4311261710ee38c23da':
  Change time format for default clock in keyguard
 2013-04-02 17:29:14 -07:00
Jim Miller
dbd9c337ed Merge "Change time format for default clock in keyguard" into jb-mr2-dev 2013-04-03 00:24:52 +00:00
kmccormick
5da7840887 am 75022d1d: am 7cf6aaf9: am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs 
* commit '75022d1d86f73308ed1cb23220e97ba7865b06f6':
  Doc update: Misc doc bugs
 2013-04-02 16:57:42 -07:00