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

157913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
George Mount
d982b582d1 Merge "Fix ChangeTransform works only once on a View." into lmp-dev 2014-10-02 14:27:21 +00:00
Lorenzo Colitti
58b8873278 am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '7fe95529e638467b77372dcac0efe51529e3bde1':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 11:11:58 +00:00
Lorenzo Colitti
7fe95529e6 Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 2014-10-02 11:05:21 +00:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp 
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
 2014-10-02 11:48:08 +01:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Neil Fuller
0c1faf43ae Merge "Switch from FloatMath -> Math and Math.hypot where possible" 2014-10-02 10:14:19 +00:00
Deepanshu Gupta
92c414724f am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 
* commit '107e1fb4b8ec4c16c5a6ed4635cb0acaea8e2b39':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
 2014-10-02 09:43:01 +00:00
Deepanshu Gupta
268f95502e am d3adf40e: am ae4cb17a: (-s ours) am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit 'd3adf40ee0845844ed132dd0b25ec0102b9bf919':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 09:42:57 +00:00
Deepanshu Gupta
e58940bf94 am ba526a28: am d00d2ff2: (-s ours) am 57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ba526a288811bc6520ad9a70d57e7ef774bbb802':
  Fix Tests after cherry picks. [DO NOT MERGE]
 2014-10-02 09:42:53 +00:00
Deepanshu Gupta
86af4579c1 am a9787de3: am 735229c5: (-s ours) am 52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 
* commit 'a9787de33c703fbfbb89b02d9d3d5642305084f8':
  Update intelliJ copyright profile [DO NOT MERGE]
 2014-10-02 09:42:49 +00:00
Deepanshu Gupta
2ffcf6ea7a am 75f2f993: am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 
* commit '75f2f993392a3903d160e7fed81c0b7ff5cf76f1':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
 2014-10-02 09:42:45 +00:00
Deepanshu Gupta
c3ad47d885 am 473a2708: am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 
* commit '473a270852c4316f9840f5190b1cdde8db9e1fef':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]
 2014-10-02 09:42:41 +00:00
Deepanshu Gupta
62813fb447 am d24b45c8: am 93bf0696: (-s ours) am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit 'd24b45c807aa788bbb25647166d155d0ed385ddf':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 09:42:37 +00:00
Deepanshu Gupta
bebf17cd11 am 42099d45: am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 
* commit '42099d45c3f39989c9c4ec1a5f67206f9c23342b':
  Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
 2014-10-02 09:42:33 +00:00
Deepanshu Gupta
ebe7858157 am b183c181: am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 
* commit 'b183c1812b76411161e9f71a313d2f6384ab9162':
  Get filename from File faster [DO NOT MERGE]
 2014-10-02 09:42:29 +00:00
Deepanshu Gupta
e17a59ba99 am 9eb0cd12: am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '9eb0cd12742bdd6098932eedfd33a0b14f2196c9':
  Add testing framework to LayoutLib. [DO NOT MERGE]
 2014-10-02 09:42:26 +00:00
Deepanshu Gupta
432b0cbc82 am 82eecaf8: am c2ffb54f: (-s ours) am 60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 
* commit '82eecaf826ab06c4f3cb0716a009ff0c8ae00711':
  Add tests to the layoutlib eclipse project. [DO NOT MERGE]
 2014-10-02 09:42:22 +00:00
Justin Koh
7eff2b547a am f7aac12e: am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev 
* commit 'f7aac12e1bc766a4357ca29d2f248eef265097f8':
  DO NOT MERGE Hide the volume panel for watches for now
 2014-10-02 09:42:18 +00:00