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

157931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
141e7fe54e am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev 
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls
 2014-10-02 22:41:54 +00:00
Jason Monk
5190063952 Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev 2014-10-02 22:36:47 +00:00
Jeff Brown
2c6d0f0584 am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev 
* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
  Fix race in RecognizerService teardown.
 2014-10-02 22:09:48 +00:00
Jeff Brown
ae309489c2 Merge "Fix race in RecognizerService teardown." into lmp-dev 2014-10-02 22:04:09 +00:00
Joe Fernandez
0d0692ab75 am 7def6026: am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit '7def60268519536083839a7fd0a2ddfd68d75504':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 22:00:57 +00:00
Joe Fernandez
7def602685 am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit '285859b13728c5cfb6124c11212978f8f95cd9de':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:50:09 +00:00
Baligh Uddin
e142a1a0cd am 9cdde5f8: Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev 
* commit '9cdde5f8348ddd03e1d6eb2c741fb3e761ab66e9':
  Fix a bug with screen brightness during screen off animation.
 2014-10-02 21:43:35 +00:00
Christopher Tate
e3d10c0356 am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 
* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
  Tweak wallpaper restore acceptance heuristics
 2014-10-02 21:43:31 +00:00
Baligh Uddin
9cdde5f834 Merge "Fix a bug with screen brightness during screen off animation." into lmp-dev 2014-10-02 21:38:25 +00:00
Christopher Tate
cdf7961f73 Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev 2014-10-02 21:32:48 +00:00
Joe Fernandez
285859b137 am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'd36dbe09a18fc7226029e841cb2a856fb83c81f2':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:32:15 +00:00
Christopher Tate
004c16654f Tweak wallpaper restore acceptance heuristics 
We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
 2014-10-02 14:27:09 -07:00
Etan Cohen
3cada8c6b3 am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev 
* commit '81e3e4724d2c506bf9e920fd253c54a0bbd38706':
  Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
 2014-10-02 21:25:19 +00:00
Etan Cohen
81e3e4724d Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev 2014-10-02 21:16:30 +00:00
Joe Fernandez
d36dbe09a1 am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:14:59 +00:00
Joe Fernandez
e961d0b521 Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 2014-10-02 21:08:27 +00:00
Joe Fernandez
65ba319742 Revert "docs: Update for Android 23.0.4" 
This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.

Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
 2014-10-02 21:07:49 +00:00
Matthew Williams
785bbc6076 am 5c6756fe: Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" 
* commit '5c6756fefb6db0fe468b9d747960a6da344880ad':
  Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"
 2014-10-02 20:54:50 +00:00
Matthew Williams
5c6756fefb Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" 
This reverts commit cf2bd348e73e880fe5bfc7a025732d4ec606ff1f.

Reverted because for account removal the AccountManagerService
delegates the sending of LOGIN_ACCOUNTS_CHANGED to the authenticator.
See b/17511110.

Change-Id: Ic03016af98070b4add5f7a5ec1fdff32ba63298e
 2014-10-02 20:47:59 +00:00
Jing Ji
4bcef7e339 am d5941978: Allow system app to take ownership of built-in permissions 
* commit 'd594197868c4a51bb8f8bd62479999debc72bf2a':
  Allow system app to take ownership of built-in permissions
 2014-10-02 20:45:30 +00:00
Jing Ji
d594197868 Allow system app to take ownership of built-in permissions 
Previous commit bfed9f34c makes the preloaded system app take
precedence over third-party apps when defining permissions, but
it also makes it be able to override android built-in permissions.

Now allow preloaded system app to take the ownership of built-in
permissions instead of overriding it.

Change-Id: I10d588d0284e4316ea4be552fd6191f33e3c725b
 2014-10-02 20:40:21 +00:00
Craig Mautner
eaa59b1ace am 9dfad8c7: Merge "Remove misleading error log." into lmp-dev 
* commit '9dfad8c7f01e8a69989d1c44deb8a621216a0d9f':
  Remove misleading error log.
 2014-10-02 20:18:34 +00:00
Craig Mautner
9dfad8c7f0 Merge "Remove misleading error log." into lmp-dev 2014-10-02 20:13:55 +00:00
Jeff Brown
bf4e414cf0 Fix a bug with screen brightness during screen off animation. 
Due to a recent change there was a regression that caused the
screen brightness to be animated down to 0 while the screen
off animation was running.  When the brightness was low this
would cause the screen off animation to be cut short.

This change ensures that we take into account the actual screen
state instead of the desired screen state when making screen
brightness decisions in case we are in the middle of a transition.

The darkness came early.  The pixel fairies trembled.

Bug: 17718416
Change-Id: Ib4b55d61b359abbc70920e324f08a5db07bdd035
 2014-10-02 13:11:02 -07:00
Jason Monk
cf0f97a3aa Synchronize on all sendProxyBroadcast calls 
To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
 2014-10-02 15:39:38 -04:00
Craig Mautner
333c2ec883 Remove misleading error log. 
It's perfectly ok for a secondary display to not have a home stack.
There is no reason to report it.

Related to b/17677973.

Change-Id: Ia9d52cabb601760d32d2b847dfa0ca4f304e4e2a
 2014-10-02 12:24:02 -07:00
Etan Cohen
6415fba31c Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA. 
Bug: 17784975
Change-Id: Ic887477fac1d45f547e30ed6e3c1158fb9a3b893
 2014-10-02 19:14:18 +00:00
Jeff Brown
9615697902 Fix race in RecognizerService teardown. 
Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
 2014-10-02 12:10:08 -07:00
Ricardo Cervera
8f99ebb1c9 am 134b62ed: am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '134b62ed14b830b467423082036b3222f84f291c':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:22:50 +00:00
Ricardo Cervera
134b62ed14 am e1e0e05a: am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit 'e1e0e05a14ebb87ca1921cf21a98b9fa0067b14e':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:18:30 +00:00
Ricardo Cervera
e1e0e05a14 am 957f45c3: am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '957f45c328c9cbe9d1fb65dab6d342dc28a85954':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:13:55 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Rich Slogar
8bf6af00ed am da5febdc: am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'da5febdcb24fd74feb1341a8b0deb92089388595':
  docs: Update for Android 23.0.4
 2014-10-02 18:00:31 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
da5febdcb2 am 74ce7413: am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit '74ce7413158607af6be2889d7392c2e904c9c210':
  docs: Update for Android 23.0.4
 2014-10-02 17:53:38 +00:00
Rich Slogar
74ce741315 am b15cd529: am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'b15cd5296675fac00e5517b89fc1263d59fbad65':
  docs: Update for Android 23.0.4
 2014-10-02 17:44:43 +00:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
Glenn Kasten
e27002d77f resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp 
Change-Id: I5a57218e81dff86f46af7067d47f7af816e2d12c
 2014-10-02 10:19:12 -07:00
Kenny Guy
e4a091bb82 am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 16:54:18 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Newton Allen
408f7534ef am d84ce32b: Merge "Fix some documentation typos." into lmp-dev 
* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
  Fix some documentation typos.
 2014-10-02 16:46:03 +00:00
Newton Allen
d84ce32bd2 Merge "Fix some documentation typos." into lmp-dev 2014-10-02 16:39:12 +00:00
Glenn Kasten
1c92912bcb am 6ba13ac5: Merge "AudioService: Fix monitorRotation for landscape applications" 
* commit '6ba13ac56663a45a7f16feb465d451f0180fae26':
  AudioService: Fix monitorRotation for landscape applications
 2014-10-02 16:23:36 +00:00
Glenn Kasten
6ba13ac566 Merge "AudioService: Fix monitorRotation for landscape applications" 2014-10-02 16:19:12 +00:00
smain@google.com
2b7d4b24a3 am 74c2ec36: Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 
* commit '74c2ec3644101ce4cc96e11a851daf21bf35e174':
  fix confusing sentence https://memegen.googleplex.com/5524829602054144
 2014-10-02 15:06:18 +00:00
smain@google.com
74c2ec3644 Merge "fix confusing sentence https://memegen.googleplex.com/5524829602054144" into lmp-dev 2014-10-02 15:02:17 +00:00
George Mount
60a27c87ef am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev 
* commit 'd982b582d1993288347f771177f6889fe14fb387':
  Fix ChangeTransform works only once on a View.
 2014-10-02 14:34:15 +00:00